fixed a couple bugs with the new DE input parsing

CERN · Mar 1, 2024 · 08531f8 · 08531f8
1 parent 3e742ab
commit 08531f8
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/MATLAB/Utilities/DE/DeDecompose.m b/MATLAB/Utilities/DE/DeDecompose.m
@@ -36,7 +36,7 @@
 % Load calibrated coefficients for transfer functions
 
 
-[scanner, calibration_pair, model, tolerance,material1,material2] = parse_inputs(varargin{:});
+[scanner, calibration_pair, model, tolerance, material1, material2] = parse_inputs(varargin);
 
 % read NIST database (values in TIGRE)
 fid = fopen('./../../../Common/data/dual_energy_calibrations.json');
@@ -46,7 +46,7 @@
 calibration_data = jsondecode(str);
 
 if ~isfield(calibration_data, scanner)
-    error(['Scanner: ', scanner, ' has not calibration data'])
+    error(['Scanner: ', scanner, ' has no calibration data'])
 end
 if ~isfield(calibration_data.(scanner),calibration_pair)
     error(['Calibration pair of energies: ', calibration_pair, ' not found in the scanner data'])
@@ -115,6 +115,7 @@
 defaults=ones(length(opts),1);
 
 % check if option has been passed as input
+nVarargs = length(argin);
 for ii=1:2:nVarargs
     ind=find(ismember(opts,lower(argin{ii})));
     if ~isempty(ind)
@@ -161,7 +162,7 @@
             end
         case 'kVh'
             if default
-                kVh=80;
+                kVh=140;
             else
                 if ~isscalar(val)
                     error('TIGRE:DEDecompose:InvalidInput','KVh must be a scalar')
@@ -170,7 +171,7 @@
             end
         case 'interpolation'
              if default
-                model='linear';
+                model='nearest';
             else
                 if ~ischar( val)
                     error('TIGRE:DEDecompose:InvalidInput','Interpolation must be a string')