bug fixes

beamtime/nappCombineSpectra.m

@@ -244,9 +244,9 @@ else
     if contains(p.Results.mode,'sum')
         TmpFileList.spectrum_counts             = sum(vq,2,'omitnan');
     elseif contains(p.Results.mode,'average') && ~contains(p.Results.energyScale,'xRay')
-        TmpFileList.spectrum_countsPerSecond    = mean(vq,2,'omitnan');
+        TmpFileList.(p.Results.tableVariable)    = mean(vq,2,'omitnan');
     elseif contains(p.Results.mode,'average') && contains(p.Results.energyScale,'xRay')
-        TmpFileList.spectrum_counts             = mean(vq,2,'omitnan');
+        TmpFileList.(p.Results.tableVariable)    = mean(vq,2,'omitnan');
     elseif contains(p.Results.mode,'subtract')
         disp('Not supported yet') % FIXME: subtraction is not implemented yet.
     end
@@ -352,7 +352,7 @@ else
     TmpFileList = struct2table(TmpFileList,'AsArray',true);
 
     % Then, we sort the table based on the time (6th column, datenum)
-    TmpFileList = sortrows(TmpFileList,6);
+    TmpFileList = sortrows(TmpFileList,'datenum');
     % Then, remove un-needed columns
     TmpFileList = removevars(TmpFileList,{'date','datenum'});
 

beamtime/nappFitGaussXps.m

@@ -61,6 +61,8 @@ function DataTable = nappFitGaussXps(DataTable,varargin)
 %     - peakPosLowerBound, peakPosUpperBound : Position constraints
 %     - peakWidthLowerBound, peakWidthUpperBound : Width constraints
 %     - backgroundRange : [low high] energy range for background
+%       backgroundRange = [low, high]: fitting window around peak 1 (or peak 2 if peakPos(1,1) < 10 eV).
+%    
 %
 %   Optional FitParameter fields for Pseudo-Voigt:
 %     - peakEta, peakEtaLowerBound, peakEtaUpperBound