5505-public/nappMATLAB-toolbox
0
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

small bug fixes and

Browse Source
This commit is contained in:
bartels-rausch committed 2023-11-28 14:36:44 +01:00
1 parent 8b55810fc6
commit 7729717da5
3 files changed
+16 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

beamtime/nappBackground.m
+8 -3
View File
@@ -106,6 +106,11 @@ for ii = 1:size(p.Results.DataTable(p.Results.tableSelection,:),1)
clearvars excludedPoints
excludedPointsZwei = excludedata( xData, yData, 'domain',[xData(1) p.Results.energyStart(2)] );
excludedPoints = excludedPointsEins & excludedPointsZwei;
elseif size(p.Results.energyStart,2) ==2 && size(p.Results.energyEnd,2) ==2
excludedPointsEins = excludedPoints;
clearvars excludedPoints
excludedPointsZwei = excludedata( xData, yData, 'domain',[p.Results.energyStart(2) p.Results.energyEnd(2)] );
excludedPoints = excludedPointsEins & excludedPointsZwei;
end
opts = fitoptions( 'Method', 'NonlinearLeastSquares','Exclude', ~excludedPoints );
@@ -224,8 +229,8 @@ else
DataTable(p.Results.tableSelection,:).(p.Results.tableVariable) = tmp;
end
% write log to table
DataTable.logBackgroundMode(p.Results.tableSelection,:) = cellstr(repmat(p.Results.mode,size(p.Results.DataTable(p.Results.tableSelection,:),1),1));
DataTable.logBackgroundRange(p.Results.tableSelection,:) = repmat([p.Results.energyStart(1) p.Results.energyEnd],size(p.Results.DataTable(p.Results.tableSelection,:),1),1);
DataTable.logBackgroundDate(p.Results.tableSelection,:) = cellstr(repmat(datestr(now),size(p.Results.DataTable(p.Results.tableSelection,:),1),1));
DataTable.logBackgroundMode(p.Results.tableSelection,:) = cellstr(repmat(p.Results.mode,size(p.Results.DataTable(p.Results.tableSelection,:),1),1));
DataTable.logBackgroundRange(p.Results.tableSelection,:) = repmat([p.Results.energyStart(1) p.Results.energyEnd(1)],size(p.Results.DataTable(p.Results.tableSelection,:),1),1);
DataTable.logBackgroundDate(p.Results.tableSelection,:) = cellstr(repmat(datestr(now),size(p.Results.DataTable(p.Results.tableSelection,:),1),1));
end
beamtime/nappCombineSpectra.m
+3 -3
View File
@@ -90,10 +90,10 @@ end
combinedSpectrum(:,1) = xq;
if contains(p.Results.mode,'sum')
combinedSpectrum(:,2) = sum(vq,2);
combinedSpectrum(:,2) = sum(vq,2,'omitnan');
elseif contains(p.Results.mode,'average')
combinedSpectrum(:,2) = mean(vq,2);
combinedSpectrum(:,3) = std(vq,0,2);
combinedSpectrum(:,2) = mean(vq,2,'omitnan');
combinedSpectrum(:,3) = std(vq,0,2,'omitnan');
elseif contains(p.Results.mode,'subtract')
disp('Not supported yet') % FIXME: subtraction is not implemented yet.
end
beamtime/nappPlot.m
+5 -1
View File
@@ -373,7 +373,11 @@ if contains(p.Results.tableVariable,'spectrum')
if ~any(existColumn)
title([{p.Results.DataTable(p.Results.tableSelection,:).name{ii} p.Results.DataTable(p.Results.tableSelection,:).lastModifiedDatestr{ii}}],'Interpreter','none')
else
title([{p.Results.DataTable(p.Results.tableSelection,:).name{ii} p.Results.DataTable(p.Results.tableSelection,:).sample{ii} p.Results.DataTable(p.Results.tableSelection,:).lastModifiedDatestr{ii}}] ,'Interpreter','none')
try
title([{p.Results.DataTable(p.Results.tableSelection,:).name{ii} p.Results.DataTable(p.Results.tableSelection,:).sample{ii} p.Results.DataTable(p.Results.tableSelection,:).lastModifiedDatestr{ii}}] ,'Interpreter','none')
catch
title([{p.Results.DataTable(p.Results.tableSelection,:).name{ii} p.Results.DataTable(p.Results.tableSelection,:).sample{ii}}] ,'Interpreter','none')
end
end
end