Format DMPexcel2mat.m

workflow/templates/easy/DMPexcel2mat.m

@@ -11,12 +11,14 @@ else
 end
 
 infile= Scanfiles(1,:);
+
 cd(MPdir)
+
 %fid=fopen(infile)%('exp23PrintTimes.xls'); % textread puts date and time sequentially into vector
+
 if ispc
   [num, txt, raw] = xlsread(infile);  %,'Yor1HitsMPsetFinal');
   fields= {txt(2,1:15)}; %or 1:17 for later but dont wish to exceed and cause error ? if used  
-  
 else
   clear MPtbl
   opts = detectImportOptions(infile);
@@ -26,12 +28,10 @@ else
   MPcell= readcell(infile);
 end
 
-
 cd(w)
 numb=0;
 clear MP;
 try
-    
   if ispc
     excLnNum=3;
     while (isequal(txt{excLnNum,1},'###'))
@@ -50,19 +50,20 @@ else
         MP(numb).orfRep= ' ';   
         MP(numb).specifics= ' ';
       end
-%{
-if size(raw,2)>17 ; Future MP field
- MP(numb).specifics2= {raw((excLnNum+1):(excLnNum+384),18)};  %added 12_1008 to specify strain Bkground in MP
-else
- MP(numb).specifics2= ' ';
-end
-%}
+
+      % Future MP field
+      % if size(raw,2)>17 
+      %   MP(numb).specifics2= {raw((excLnNum+1):(excLnNum+384),18)};  %added 12_1008 to specify strain Bkground in MP
+      % else
+      %   MP(numb).specifics2=' ';
+      % end
+
       excLnNum=excLnNum+385;
 
       msg=strcat('NumberOfMP = ',num2str(numb), '   lastLineNo. = ',num2str(excLnNum));
 
-    end % end if ispc
- else  %if not ispc
+    end
+  else 
     excLnNum=1;
     while (isequal(MPcell{(excLnNum+2),1},'###'))
       numb=numb+1;    
@@ -91,37 +92,27 @@ msg=strcat('NumberOfMP = ',num2str(numb), '   lastLineNo. = ',num2str(excLnNum))
       excLnNum=excLnNum+385;
       msg=strcat('NumberOfMP = ',num2str(numb), 'lastLineNo. = ',num2str(excLnNum))
     end
- 
-  end %end of if ispc for MP while loop choice PC or Linux-other (ln~48)
-
+  end
 catch ME
   h = msgbox(msg,'Check Number of Master Plates and Excel Lines')
   uiwait(h);
 end %end for try MP excel sheet input
 
-%*********************************************************************
 %DMupload
 %Drug and Media Plate setup  Upload from Excel
-%scan().plate().LocInd().gene
 cd(MPdir);
 excLnNum=1;
-%w=pwd
-%cd('D:\EASY\Experiments\');  %cd(ExpPath);  %
 numOfDrugs=0;
 numOfMedias=0;
+
 %GUI input for selecting a MasterPlate Excel file
 questdlg('\fontsize{20} Select DrugMedia File','File Selection','OK', struct('Default','OK','Interpreter','tex'));
 [Scanfiles, pathname]=uigetfile('*.*', 'MultiSelect','off');
-if ispc
- DMdir= fullfile(pathname,'\');
-else
-    DMdir=fullfile(pathname,'/');
-end
-
+DMdir=fullfile(pathname);
 clear infile;
 infile= Scanfiles(1,:);
 cd(DMdir)
-%fid=fopen(infile)%('exp23PrintTimes.xls'); % textread puts date and time sequentially into vector
+
 if ispc
   [num, txt, raw] = xlsread(infile);  %,'Yor1HitsMPsetFinal');
   fields= {txt(2,1:5)};
@@ -133,13 +124,10 @@ else
   Linked= DMtbl{1,1};
   DMcell= readcell(infile);
 end
+
 cd(w)
 numb=0;
 
-%fields= {txt(2,1:5)};
-%Linked= num(1,1);
-
-
 if isequal(Linked,1)   %Drugs and Media are linked 1 to 1; else they are combinatorial
   clear DM;
 %try
@@ -180,9 +168,6 @@ else
       msg=strcat('NumberOf1:1DrugMediaPlates = ',num2str(numb), '   lastLineNo. = ',num2str(excLnNum))
     end
   end
-
-
-
 end
 %Legacy contengency  -Not ever used!!
 if isequal(Linked,0)   %0 indicates Drugs and Media are combinatorial
@@ -218,9 +203,7 @@ else %else if not PC (Then linux or other)
       excLnNum=excLnNum+1;
     end
   end
- 
   msg=strcat('NumberOfDrugs = ',num2str(drgCnt), '     NumberOfMedias = ',num2str(medCnt)  )
-
 end
 
 save (fullfile(MPdir,'MPDMmat'), 'fields','MP','DM','Linked');