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

Tighten up formatting

Browse Source
This commit is contained in:
Bryan Roessler
2024-07-25 14:38:26 -04:00
parent e8f86da392
commit 513f531fa4
1 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
workflow/templates/easy/NCscurImCF_3parfor.m
View File

@@ -5,6 +5,7 @@ function [resMatStd, resMat, selTimesStd, selIntensStd, FiltTimesELr, NormIntens
% Preallocate % Preallocate
resMatStd=zeros(1,27); resMatStd=zeros(1,27);
resMat=zeros(1,27); resMat=zeros(1,27);
% Set internal variables sent to matlab fit function % Set internal variables sent to matlab fit function
me=200; me=200;
meL=750; meL=750;
@@ -17,6 +18,7 @@ function [resMatStd, resMat, selTimesStd, selIntensStd, FiltTimesELr, NormIntens
normIntens=[]; normIntens=[];
nn=1; nn=1;
numFitTpts=0; numFitTpts=0;
% Build filterTimes and normIntens from spot dataMatrix selection codes produced in filter section % Build filterTimes and normIntens from spot dataMatrix selection codes produced in filter section
for n=1:size(dataMatrix,2) for n=1:size(dataMatrix,2)
if (((dataMatrix(3,n)==1))||(dataMatrix(3,n)==3)||(dataMatrix(3,n)==2)... if (((dataMatrix(3,n)==1))||(dataMatrix(3,n)==3)||(dataMatrix(3,n)==2)...
@@ -114,30 +116,25 @@ function [resMatStd, resMat, selTimesStd, selIntensStd, FiltTimesELr, NormIntens
resMatStd(12)=lup; resMatStd(12)=lup;
resMatStd(13)=currSpotArea; resMatStd(13)=currSpotArea;
resMatStd(14)=lastIntensUsedStd; % filtNormIntens(length(filtNormIntens)); resMatStd(14)=lastIntensUsedStd; % filtNormIntens(length(filtNormIntens));
maxRateTime=0; %[]; %Std shows []; ELr shows 0; %parfor maxRateTime=0; %[]; %Std shows []; ELr shows 0; %parfor
resMatStd(15)=0; %maxRateTimestdMeth; resMatStd(15)=0; %maxRateTimestdMeth;
resMatStd(16)=lastTptUsedStd; resMatStd(16)=lastTptUsedStd;
if isempty(Tpt1Std) if isempty(Tpt1Std)
Tpt1Std=777; Tpt1Std=777;
end end
resMatStd(17)=Tpt1Std; resMatStd(17)=Tpt1Std;
resMatStd(18)=bl; % perform in the filter section of NCfitImCFparfor resMatStd(18)=bl; % perform in the filter section of NCfitImCFparfor
resMatStd(19)=fitblStd; %Taken from NCfil... and not affected by NCscur...changes resMatStd(19)=fitblStd; % taken from NCfil... and not affected by NCscur...changes
resMatStd(20)=minTime; %Not affected by changes made in NCscur...for refined 'r' resMatStd(20)=minTime; % not affected by changes made in NCscur...for refined 'r'
resMatStd(21)=thresGT2TmStd; resMatStd(21)=thresGT2TmStd;
resMatStd(22)=numFitTptsStd; resMatStd(22)=numFitTptsStd;
resMatStd(23)=numTptsGT2Std; resMatStd(23)=numTptsGT2Std;
resMatStd(24)=999; %The Standard method has no cuts .:.no cutTm resMatStd(24)=999; % yhe Standard method has no cuts .:.no cutTm
resMatStd(25)=999; resMatStd(25)=999;
resMatStd(26)=999; resMatStd(26)=999;
resMatStd(27)=999; resMatStd(27)=999;
%if SwitchEvsEL==3 %Remove 'SwitchEvsEL==...' temporary SWITCH when Hartman decides what he wants
%*********************************************************************************
% ELr New Experimental data through L+deltaS Logistic fit for 'Improved r' Fitting % ELr New Experimental data through L+deltaS Logistic fit for 'Improved r' Fitting
%*********************************************************************************
FiltTimesELr=[]; %{ii}=filterTimes; FiltTimesELr=[]; %{ii}=filterTimes;
NormIntensELr=[]; %{ii}=normIntens; NormIntensELr=[]; %{ii}=normIntens;
normIntens=selIntensStd; normIntens=selIntensStd;