bryan/hartman-server
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Who even knows at this point

Browse Source
This commit is contained in:
Bryan Roessler
2024-07-30 13:42:48 -04:00
parent fe9b338324
commit 79e3676ed3
38 changed files with 465 additions and 746 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
workflow/apps/matlab/easy/DMPexcel2mat.m
View File

@@ -129,7 +129,7 @@ try
% MP(numb).specifics2=' ';
% end
excLnNum=excLnNum+385;
msg=strcat('NumberOfMP = ',num2str(numb), ' lastLineNo. = ',num2str(excLnNum));
msg=strcat('NumberOfMP=',num2str(numb), ' lastLineNo.=',num2str(excLnNum));
end
else
excLnNum=1;
@@ -157,7 +157,7 @@ try
MP(numb).specifics= ' ';
end
excLnNum=excLnNum+385;
msg=strcat('NumberOfMP = ',num2str(numb), 'lastLineNo. = ',num2str(excLnNum));
msg=strcat('NumberOfMP=',num2str(numb), 'lastLineNo.=',num2str(excLnNum));
end
end
catch ME
@@ -261,7 +261,7 @@ if isequal(Linked,1) % Drugs and Media are linked 1 to 1; else they are combinat
DM.mod2(numb)={raw(excLnNum,7)};
DM.conc2(numb)={raw(excLnNum,8)};
excLnNum=excLnNum+1;
msg=strcat('NumberOf1:1DrugMediaPlates = ',num2str(numb), ' lastLineNo. = ',num2str(excLnNum));
msg=strcat('NumberOf1:1DrugMediaPlates=',num2str(numb), ' lastLineNo.=',num2str(excLnNum));
end
else
clear DM
@@ -283,7 +283,7 @@ if isequal(Linked,1) % Drugs and Media are linked 1 to 1; else they are combinat
DM.conc2(numb)={DMtbl(excLnNum,8)};
DM.conc2(numb)=table2cell(DM.conc2{numb});
excLnNum=excLnNum+1;
msg=strcat('NumberOf1:1DrugMediaPlates = ',num2str(numb), ' lastLineNo. = ',num2str(excLnNum));
msg=strcat('NumberOf1:1DrugMediaPlates=',num2str(numb), ' lastLineNo.=',num2str(excLnNum));
end
end
end
@@ -321,7 +321,7 @@ if isequal(Linked,0) % 0 indicates Drugs and Media are combinatorial
excLnNum=excLnNum+1;
end
end
msg=strcat('NumberOfDrugs = ',num2str(drgCnt), ' NumberOfMedias = ',num2str(medCnt) );
msg=strcat('NumberOfDrugs=',num2str(drgCnt), ' NumberOfMedias=',num2str(medCnt) );
end
save(mpdmFile, 'fields','MP','DM','Linked');

4
workflow/apps/matlab/easy/DgenResults.m
View File

@@ -281,7 +281,7 @@ for s=1:size(scan,2)
outIntens=[];
outIntens=zeros(384,dataLength);
intensBlob='';
tmBlob ='';
tmBlob='';
for j=1:dataLength %size(RawIntens,2) %size(outTseries,1)
if Ag(n)==0,Ag(n)=scan(s).Awindow;end
@@ -565,7 +565,7 @@ try
outIntens=[];
outIntens=zeros(384,dataLength);
intensBlob='';
tmBlob ='';
tmBlob='';
for j=1:dataLength %size(RawIntens,2) %size(outTseries,1)
if Ag(n)==0,Ag(n)=scan(s).Awindow;end

9
workflow/apps/matlab/easy/EASYconsole.m
View File

@@ -293,7 +293,7 @@ function NewExpDat_Callback(~, ~, ~)
% create supporting dirs
% this is also in the workflow script but here for standalone mode
dirs={'PrintResults', 'CFfigs', 'Fotos', 'Fotos/BkUp'};
dirs={'PrintResults', 'CFfigs', 'Fotos'};
for i=1:length(dirs)
d=dirs{i};
if ~exist(fullfile(easyResultsDir, d), 'dir')
@@ -335,7 +335,7 @@ function LoadDatFile_Callback(~, ~, ~)
global fhconsole
try
questdlg('Load results .mat from ../ExpJobs/YourJob/Results/matResults/','File Creation','OK', struct('Default','OK','Interpreter','tex'));
questdlg('Load results .mat from ../out/project/','File Creation','OK', struct('Default','OK','Interpreter','tex'));
[inputFile,inputPath]=uigetfile('.mat','Open Experiment folder and data storage .mat file name','MultiSelect','off');
matDir=fullfile(inputPath);
matFile=fullfile(inputPath,inputFile);
@@ -370,11 +370,6 @@ function LoadDatFile_Callback(~, ~, ~)
disp('WARNING: cannot find project scans');
end
bkupDir=fullfile(matDir,'BkUp');
if ~exist(bkupDir, 'dir')
mkkdir(bkupDir);
end
% Create supporting dirs
dirs={'PrintResults', 'figs', 'CFfigs', 'PTmats', 'Fotos'};
for i=1:length(dirs)

4
workflow/apps/matlab/easy/par4Gbl_Main8c.m
View File

@@ -48,7 +48,7 @@ end
% EASYconsole
if exist(matFile, 'file')
bkUpMatFile=fullfile(matDir,'BkUp',matFile);
bkUpMatFile=fullfile(matFile, '.bk');
copyfile(matFile,bkUpMatFile);
end
@@ -67,7 +67,7 @@ catch
load(fullfile(pointMapsResultsDir,'Nbdg')); %Left in to accomodate loads of work before 20_0819
end
% Load Fotos stored data
fotosToLoad = {'Coordinates', 'BGatTpts', 'anlZones', 'NCFparms'};
fotosToLoad={'Coordinates', 'BGatTpts', 'anlZones', 'NCFparms'};
for i=1:length(fotosToLoad)
try
load(fullfile(fotosResultsDir, fotosToLoad{i}));