From d2a5d9e69f63537709d701881169f775c7e1af82 Mon Sep 17 00:00:00 2001 From: Bryan Roessler Date: Mon, 29 Jul 2024 17:45:16 -0400 Subject: [PATCH] EZdiagRf refactor --- workflow/apps/matlab/ezview/EZdiagRFsSheet.m | 223 ++++++++----------- workflow/apps/matlab/ezview/EZexpSel.m | 17 +- workflow/apps/matlab/ezview/EZvInitLoad.m | 24 +- workflow/apps/matlab/ezview/EZvStartup.m | 4 - 4 files changed, 108 insertions(+), 160 deletions(-) delete mode 100755 workflow/apps/matlab/ezview/EZvStartup.m diff --git a/workflow/apps/matlab/ezview/EZdiagRFsSheet.m b/workflow/apps/matlab/ezview/EZdiagRFsSheet.m index 445d123d..a346dbb9 100755 --- a/workflow/apps/matlab/ezview/EZdiagRFsSheet.m +++ b/workflow/apps/matlab/ezview/EZdiagRFsSheet.m @@ -1,134 +1,105 @@ -%Diagnostic sheet called by EZvInitLoad.m, EZexpSel.m ?EZinteractDev_.m? -%EZdiagRFsSheet.m -try %Try the whole routine global Exp -if strcmp(Exp(expN).DexpType,'multi')||... - strcmp(Exp(expN).DexpType,'chrono') - DexpN=n; -end -rnames=[]; -data=[]; -try -cnames= {'RF Name','Median','Mean','STD','Minimum','Maximum'}; -rCnt=0; -RFfilename= fullfile(Exp(expN).Dexp(DexpN).resDir,'PrintResults','!RFsDiagnostics.txt'); -fid = fopen(RFfilename,'w'); %('RFdiagnostic.txt','w'); -ftitle= strcat(ExpPath,':::Reference Diagnostic Values'); -try -fprintf(fid,'%s\n',ftitle); -catch mErr - errorMessage= mErr.message - msg= 'Check Permissions of PrintResult folder. !RFsDiagnostics.txt may not be created'; - warning((msg)); - warndlg('Check Permissions of PrintResult folder. !RFsDiagnostics.txt may not be created'); -end -fprintf(fid,'%s\t %s\t %s\t %s\t %s\t %s','RF Name','Median','Mean','STD','Min','Max'); -fprintf(fid,'\n'); - -rnames= cell(1,1); -for d=1:DMnum - try - %RF1 MasterPlate Stats - RFmd1LB= Exp(expN).Dexp(DexpN).RFmd1LB(d); - mval1= Exp(expN).Dexp(DexpN).RFmd1val(d); - mean1= Exp(expN).Dexp(DexpN).mean1(d); - std1= Exp(expN).Dexp(DexpN).std1(d); - min1= Exp(expN).Dexp(DexpN).min1(d); - max1= Exp(expN).Dexp(DexpN).max1(d); - - fprintf(fid,'%s\t %7.2f\t %7.4f\t %7.4f\t %7.4f\t %7.4f\t', cell2mat(RFmd1LB), mval1,mean1,std1,min1,max1) - fprintf(fid,'\n') - - rCnt=rCnt+1; - data(rCnt,1:5)= [mval1,mean1,std1,min1,max1]; - rnames(rCnt)= RFmd1LB; - catch mErr - message= 'No RF1 MasterPlate' - end - try - %RF2 MasterPlate Stats - RFmd2LB= Exp(expN).Dexp(DexpN).RFmd2LB(d); - mval2= Exp(expN).Dexp(DexpN).RFmd2val(d); - mean2= Exp(expN).Dexp(DexpN).mean2(d); - std2= Exp(expN).Dexp(DexpN).std2(d); - min2= Exp(expN).Dexp(DexpN).min2(d); - max2= Exp(expN).Dexp(DexpN).max2(d); +try %Try the whole routine - fprintf(fid,'%s\t %7.2f\t %7.4f\t %7.4f\t %7.4f\t %7.4f\t', cell2mat(RFmd2LB),mval2,mean2,std2,min2,max2) - fprintf(fid,'\n') - - rCnt=rCnt+1; - data(rCnt,1:5)= [mval2,mean2,std2,min2,max2]; - rnames(rCnt)= RFmd2LB; - catch ME - message= 'No RF2 MasterPlate' + if strcmp(Exp(expN).DexpType,'multi') ||... + strcmp(Exp(expN).DexpType,'chrono') + DexpN=n; end - %Distributed Global stats + rnames=[]; + data=[]; try - RFmdGLB= Exp(expN).Dexp(DexpN).RFmdGLB(d); - mvalsDG= Exp(expN).Dexp(DexpN).RFmedianG(d); - RFmeanG= Exp(expN).Dexp(DexpN).RFmeanG(d); - RFstdG= Exp(expN).Dexp(DexpN).RFstdG(d); - maxG= Exp(expN).Dexp(DexpN).RFmaxG(d); - minG= Exp(expN).Dexp(DexpN).RFminG(d); - - fprintf(fid,'%s\t %7.2f\t %7.4f\t %7.4f\t %7.4f\t %7.4f\t', cell2mat(RFmdGLB),mvalsDG,RFmeanG,RFstdG,minG,maxG) - fprintf(fid,'\n') - - rCnt=rCnt+1; - data(rCnt,1:5)= [mvalsDG,RFmeanG,RFstdG,minG,maxG]; - rnames(rCnt)= RFmdGLB; - catch ME - message= 'No RF2 MasterPlate' - end -end %for d=1:DMnum - -%Distributed RF1 Plates Stats Print -% -try -for d=1:DMnum - for mm=1:length(dMPs) - %RFmd1posD= Exp(expN).Dexp(DexpN).RFmdPindx(d,dMPs(mm)); - %dMP= Exp(expN).Dexp(DexpN).RFmdPpltN(d,dMPs(mm)); %This is a storage of the MasterPlate used NOT the ScanPlate? WeMight wish to store the ScanPlateNumber also??? - %rf1scNdisp= Exp(expN).Dexp(DexpN).RFmdPscanN(d,dMPs(mm)); - RFmdPLB= Exp(expN).Dexp(DexpN).RFmdPLB(d,dMPs(mm)); - mval1Disp= Exp(expN).Dexp(DexpN).RFmedianP(d,dMPs(mm)); - mean1Disp= Exp(expN).Dexp(DexpN).meanP(d,dMPs(mm)); - std1Disp= Exp(expN).Dexp(DexpN).stdP(d,dMPs(mm)); - minDisp= Exp(expN).Dexp(DexpN).minP(d,dMPs(mm)); - maxDisp= Exp(expN).Dexp(DexpN).maxP(d,dMPs(mm)); - - fprintf(fid,'%s\t %7.2f\t %7.4f\t %7.4f\t %7.4f\t %7.4f\t', cell2mat(RFmdPLB),mval1Disp,mean1Disp,std1Disp,minDisp,maxDisp); - fprintf(fid,'\n'); - - rCnt=rCnt+1; - data(rCnt,1:5)= [mval1Disp,mean1Disp,std1Disp,minDisp,maxDisp]; - rnames(rCnt)= RFmdPLB; %cell2mat(RFmdPLB); - - end %for mm=1:length(dMPs) -end %for d=1:DMnum -catch ME - message= 'No Distributed RF1 MasterPlates' -end + cnames={'RF Name','Median','Mean','STD','Minimum','Maximum'}; + rCnt=0; + RFfilename= fullfile(Exp(expN).Dexp(DexpN).resDir,'PrintResults','!RFsDiagnostics.txt'); + fid = fopen(RFfilename,'w'); %('RFdiagnostic.txt','w'); + ftitle= strcat(ExpPath,':::Reference Diagnostic Values'); + try + fprintf(fid,'%s\n',ftitle); + catch mErr + errorMessage=mErr.message + msg='Check Permissions of PrintResult folder. !RFsDiagnostics.txt may not be created'; + warning((msg)); + warndlg('Check Permissions of PrintResult folder. !RFsDiagnostics.txt may not be created'); + end + fprintf(fid,'%s\t %s\t %s\t %s\t %s\t %s','RF Name','Median','Mean','STD','Min','Max'); + fprintf(fid,'\n'); -catch + rnames= cell(1,1); + for d=1:DMnum + try + % RF1 MasterPlate Stats + RFmd1LB=Exp(expN).Dexp(DexpN).RFmd1LB(d); + mval1=Exp(expN).Dexp(DexpN).RFmd1val(d); + mean1=Exp(expN).Dexp(DexpN).mean1(d); + std1=Exp(expN).Dexp(DexpN).std1(d); + min1=Exp(expN).Dexp(DexpN).min1(d); + max1=Exp(expN).Dexp(DexpN).max1(d); + fprintf(fid,'%s\t %7.2f\t %7.4f\t %7.4f\t %7.4f\t %7.4f\t\n',... + cell2mat(RFmd1LB), mval1,mean1,std1,min1,max1) + rCnt=rCnt+1; + data(rCnt,1:5)=[mval1,mean1,std1,min1,max1]; + rnames(rCnt)=RFmd1LB; + catch + message='No RF1 MasterPlate' + end + try + % RF2 MasterPlate Stats + RFmd2LB=Exp(expN).Dexp(DexpN).RFmd2LB(d); + mval2=Exp(expN).Dexp(DexpN).RFmd2val(d); + mean2=Exp(expN).Dexp(DexpN).mean2(d); + std2=Exp(expN).Dexp(DexpN).std2(d); + min2=Exp(expN).Dexp(DexpN).min2(d); + max2=Exp(expN).Dexp(DexpN).max2(d); + fprintf(fid,'%s\t %7.2f\t %7.4f\t %7.4f\t %7.4f\t %7.4f\t\n', cell2mat(RFmd2LB),mval2,mean2,std2,min2,max2) + rCnt=rCnt+1; + data(rCnt,1:5)= [mval2,mean2,std2,min2,max2]; + rnames(rCnt)= RFmd2LB; + catch + message='No RF2 MasterPlate' + end + % Distributed Global stats + try + RFmdGLB=Exp(expN).Dexp(DexpN).RFmdGLB(d); + mvalsDG=Exp(expN).Dexp(DexpN).RFmedianG(d); + RFmeanG=Exp(expN).Dexp(DexpN).RFmeanG(d); + RFstdG=Exp(expN).Dexp(DexpN).RFstdG(d); + maxG=Exp(expN).Dexp(DexpN).RFmaxG(d); + minG=Exp(expN).Dexp(DexpN).RFminG(d); + fprintf(fid,'%s\t %7.2f\t %7.4f\t %7.4f\t %7.4f\t %7.4f\t\n', cell2mat(RFmdGLB),mvalsDG,RFmeanG,RFstdG,minG,maxG) + rCnt=rCnt+1; + data(rCnt,1:5)=[mvalsDG,RFmeanG,RFstdG,minG,maxG]; + rnames(rCnt)=RFmdGLB; + catch + message='No RF2 MasterPlate' + end + end + + % Distributed RF1 Plates Stats Print + try + for d=1:DMnum + for mm=1:length(dMPs) + % RFmd1posD= Exp(expN).Dexp(DexpN).RFmdPindx(d,dMPs(mm)); + % dMP= Exp(expN).Dexp(DexpN).RFmdPpltN(d,dMPs(mm)); %This is a storage of the MasterPlate used NOT the ScanPlate? WeMight wish to store the ScanPlateNumber also??? + % rf1scNdisp= Exp(expN).Dexp(DexpN).RFmdPscanN(d,dMPs(mm)); + RFmdPLB=Exp(expN).Dexp(DexpN).RFmdPLB(d,dMPs(mm)); + mval1Disp=Exp(expN).Dexp(DexpN).RFmedianP(d,dMPs(mm)); + mean1Disp=Exp(expN).Dexp(DexpN).meanP(d,dMPs(mm)); + std1Disp=Exp(expN).Dexp(DexpN).stdP(d,dMPs(mm)); + minDisp=Exp(expN).Dexp(DexpN).minP(d,dMPs(mm)); + maxDisp=Exp(expN).Dexp(DexpN).maxP(d,dMPs(mm)); + fprintf(fid,'%s\t %7.2f\t %7.4f\t %7.4f\t %7.4f\t %7.4f\t\n', cell2mat(RFmdPLB),mval1Disp,mean1Disp,std1Disp,minDisp,maxDisp); + rCnt=rCnt+1; + data(rCnt,1:5)= [mval1Disp,mean1Disp,std1Disp,minDisp,maxDisp]; + rnames(rCnt)= RFmdPLB; + end + end + catch + message='No Distributed RF1 MasterPlates' + end + catch Warndlg('Problem writing the RFdiagnosticSheet.txt file') -end -fclose(fid) + end + fclose(fid) catch - msg= 'EZdiagRFsSheet.m failed. Check Permissions' - +msg='EZdiagRFsSheet.m failed. Check Permissions' end - - - - - -%{ -mErr - message= mErr.stack(end).line - error_line = mErr.stack(end).line -%} - - - diff --git a/workflow/apps/matlab/ezview/EZexpSel.m b/workflow/apps/matlab/ezview/EZexpSel.m index 65ba2c5a..77efe5a9 100755 --- a/workflow/apps/matlab/ezview/EZexpSel.m +++ b/workflow/apps/matlab/ezview/EZexpSel.m @@ -1,19 +1,4 @@ -%EZexpSel.m %modified to accomodate App Designer issues 230829 -%Called from EZviewGui.m or EZviewGui_export.m or migrapted EZviewGui_App.wlapp 230831 -%{ ->EZexpSel - >EZVimDisplay - >EZhtMap - >EZdiagRFsSheet - >EZsingleExUserRF - >EZmultigeneRFsLst - >EZdiagRFsSheet - >EZhtMap - >EZmultiDayGui - >EZmultiDay - >EZmultiExLoad -%} - + global Expaa global Expbb global expType diff --git a/workflow/apps/matlab/ezview/EZvInitLoad.m b/workflow/apps/matlab/ezview/EZvInitLoad.m index 10f81641..b809e6f1 100755 --- a/workflow/apps/matlab/ezview/EZvInitLoad.m +++ b/workflow/apps/matlab/ezview/EZvInitLoad.m @@ -1,5 +1,4 @@ %EZvInitLoad -clear Exp global Exp global Expaa global Expbb @@ -7,15 +6,15 @@ global userPars global usrExpJobsDir %added 23_0508 global zonePB %added 230828 to fix migration issues -userPars.BPdefault= {'on','on','0.3','8','45','1000'}; -userPars.boxplotFlg= 1; -userPars.BPoutliers= 'On'; -userPars.BPnotch= 'On'; -userPars.BPlblShft= 0.3; -userPars.BPfontSz= 8; -userPars.BProt= 45; -userPars.Trenddefault= {'1000'}; -userPars.kfiltLim= str2double(userPars.BPdefault(6)); +userPars.BPdefault={'on','on','0.3','8','45','1000'}; +userPars.boxplotFlg=1; +userPars.BPoutliers='On'; +userPars.BPnotch='On'; +userPars.BPlblShft=0.3; +userPars.BPfontSz=8; +userPars.BProt=45; +userPars.Trenddefault={'1000'}; +userPars.kfiltLim=str2double(userPars.BPdefault(6)); %Exp(expN).expLoadCnt=0; ??? May need to add in Future Exp(1).cTraceN= 1; %Added for Cummulative Composite Olay plotting @@ -367,8 +366,7 @@ for mp=1:MPnum %length(Exp(expN).Dexp(1).MP) end %if isempty(regexpi(char((Exp(expN).Dexp(1).MP(mp).genename{1}(ind384))),'blank'))... %********************************************************************** - catch - error='EZexpSel lineAfter 135 EZvInitLoad.m' + catch mp ind384 msgBadGeneName= strcat('check genename at mp=',num2str(mp),' indx=',num2str(ind384)) @@ -625,7 +623,6 @@ end catchissue='Ln408' Exp(1).Dexp(1).RFmd2pltN= 1; Exp(2).Dexp(1).RFmd2pltN= 1; Exp(3).Dexp(1).RFmd2pltN= 1; end - error='EZexpSel lineAfter 354' end %if RF2scanN doesn't exist this addition to list will be skipped RFcombValList= cat(1,medValList1{d+1},medValList2{d+1}); Exp(1).Dexp(1).RFmean(d+1)= mean(RFcombValList);Exp(2).Dexp(1).RFmean(d+1)= mean(RFcombValList);Exp(3).Dexp(1).RFmean(d+1)= mean(RFcombValList); @@ -754,7 +751,6 @@ catch %try ln565 catchissue='Ln' Exp(expN).Dexp(1).RFmdPpltN= 1; %This might keep from breaking BUT ??? end - error='EZexpSel lineAfter 565' end %try ~ln565 end %for d=0:DMnum diff --git a/workflow/apps/matlab/ezview/EZvStartup.m b/workflow/apps/matlab/ezview/EZvStartup.m deleted file mode 100755 index 4d2cf4fc..00000000 --- a/workflow/apps/matlab/ezview/EZvStartup.m +++ /dev/null @@ -1,4 +0,0 @@ -%EZviewGui.m startup - - -EZviewGui \ No newline at end of file