Increase allowed channel count to 128k.

Author: wcjohns

SpecUtils/EnergyCalibration.h

@@ -276,7 +276,7 @@ namespace SpecUtils
      
      Values larger than this will cause an exception to be thrown when setting the calibration.
      */
-    static const size_t sm_max_channels; // = 65536 + 8
+    static const size_t sm_max_channels; // 131072 (previous to 20241112, used 65536 + 8)
 
     /** The largest positive value of the offset (zeroth energy cal term) allowed for normal polynomial energy calibration.
      i.e., if a gamma spectrum has a larger value than this, then the calibration coefficients will be considered garbage and not used.

src/EnergyCalibration.cpp

@@ -47,7 +47,7 @@ using namespace std;
 namespace SpecUtils
 {
 const size_t EnergyCalibration::sm_min_channels = 1;
-const size_t EnergyCalibration::sm_max_channels = 65536 + 8;
+const size_t EnergyCalibration::sm_max_channels = 131072; //65536 + 8;
 
 const float EnergyCalibration::sm_polynomial_offset_limit = 5500.0f;
 
@@ -121,7 +121,9 @@ void EnergyCalibration::set_polynomial( const size_t num_channels,
     throw runtime_error( "EnergyCalibration::set_polynomial: requires >=1 channels" );
 
   if( num_channels > sm_max_channels )
-    throw runtime_error( "EnergyCalibration::set_polynomial: must be called with <= 64k channels" );
+    throw runtime_error( "EnergyCalibration::set_polynomial: must be called with <= "
+                        + std::to_string(sm_max_channels) + " channels"
+                        " (called for " + std::to_string(num_channels) + ")" );
 
   //Find the last non-zero coefficients (e.g., strip off trailing zeros)
   size_t last_iter = coeffs.size();

src/SpecFile.cpp

@@ -6515,7 +6515,12 @@ void SpecFile::set_detector_type_from_other_info()
     else if( icontains(instrument_model_,"uDetective")
             || (icontains(instrument_model_,"Detective") && icontains(instrument_model_,"micro")) )
       detector_type_ = DetectorType::MicroDetective;
-    else if( iequals_ascii(instrument_model_,"Detective X") )
+    else if( iequals_ascii(instrument_model_,"Detective X")
+            || iequals_ascii(instrument_model_,"Detective-X")
+            || iequals_ascii(instrument_model_,"DetectiveX")
+            || iequals_ascii(instrument_model_,"DetX")
+            || iequals_ascii(instrument_model_,"Det-X")
+            || iequals_ascii(instrument_model_,"Det X"))
       detector_type_ = DetectorType::DetectiveX;
     else if( icontains(instrument_model_,"Detective") )
       detector_type_ = DetectorType::DetectiveUnknown;