Add Raysid, KromekGR1, and KromekD5 to DetectorType's detected.

Author: wcjohns

SpecUtils/SpecFile.h

@@ -343,6 +343,10 @@ enum class DetectorType : int
   MicroRaider,
   /** Scan-Electronics RadiaCode-10x detector with CsI(Tl) scintillator */
   RadiaCode,
+
+  /** Raysid 5cm³ CsI/Tl detector */
+  Raysid,
+
   Interceptor,
   RadHunterNaI,
   RadHunterLaBr3,
@@ -375,7 +379,13 @@ enum class DetectorType : int
 
   /** The Kromek D3 and D3S detector with Csl(TI) crystal volume of 1 cubic inch */
   KromekD3S,
-  
+
+  /** The Kromek D5 detector with 1.5x1.5 CLLBC detector */
+  KromekD5,
+
+  /** The Kromek GR1 detector with 1cm3 CZT detector */
+  KromekGR1,
+
   /** PHDS Fulcrum; HPGe 12% efficient (rel. to 3x3 NaI)  handheld detector. */
   Fulcrum,
 
@@ -385,7 +395,7 @@ enum class DetectorType : int
   /** BNC SAM-950 detector.  There are 1.5x1.5, 2x2, 3x3 NaI variants, as well as LaBr3 2x2, and CeBr3 2x2, but
    these are not currently differentiated because I havent seen example files of them.
    
-   Also not: The BNC SAMpack may erroneously claim to be a SAM-950 detector, so will get this DetectorType ID applied.
+   Also note: The BNC SAMpack may erroneously claim to be a SAM-950 detector, so will get this DetectorType ID applied.
    */
   Sam950,
 

bindings/python/SpecFile_py.cpp

@@ -1401,6 +1401,9 @@ py::enum_<SpecUtils::DetectorType>(m, "DetectorType")
   .value("Fulcrum", SpecUtils::DetectorType::Fulcrum)
   .value("Fulcrum40h", SpecUtils::DetectorType::Fulcrum40h)
   .value("Sam950", SpecUtils::DetectorType::Sam950)
+  .value("Raysid", SpecUtils::DetectorType::Raysid)
+  .value("KromekGR1", SpecUtils::DetectorType::KromekGR1)
+  .value("KromekD5", SpecUtils::DetectorType::KromekD5)
   .value("Unknown", SpecUtils::DetectorType::Unknown);
 
 

src/SpecFile.cpp

@@ -1422,6 +1422,9 @@ const std::string &detectorTypeToString( const DetectorType type )
   static const string sm_VerifinderNaI                = "Verifinder-NaI";
   static const string sm_VerifinderLaBr               = "Verifinder-LaBr";
   static const string sm_KromekD3S                    = "Kromek D3S";
+  static const string sm_KromekGR1                    = "Kromek GR1";
+  static const string sm_KromekD5                     = "Kromek D5";
+  static const string sm_Raysid                       = "Raysid";
   static const string sm_Fulcrum                      = "Fulcrum";
   static const string sm_Fulcrum40h                   = "Fulcrum-40h";
   static const string sm_Sam950                       = "Sam-950";
@@ -1519,6 +1522,12 @@ const std::string &detectorTypeToString( const DetectorType type )
       return sm_VerifinderLaBr;
     case DetectorType::KromekD3S:
       return sm_KromekD3S;
+    case DetectorType::KromekD5:
+      return sm_KromekD5;
+    case DetectorType::KromekGR1:
+      return sm_KromekGR1;
+    case DetectorType::Raysid:
+      return sm_Raysid;
     case DetectorType::Fulcrum:
       return sm_Fulcrum;
     case DetectorType::Fulcrum40h:
@@ -6546,21 +6555,39 @@ void SpecFile::set_detector_type_from_other_info()
   }//if( iequals_ascii( manufacturer_,"ORTEC" ) )
 
 
-  if( icontains( manufacturer_,"Kromek" ) )
+  if( icontains(manufacturer_, "Kromek") || icontains(model, "Kromek") )
   {
     // I've seen manufacturer name be either "Kromek" or "Kromek Ltd"
 
-    if( istarts_with(instrument_model_,"D3") || iequals_ascii(instrument_model_,"D3S") )
+    if( icontains(model,"D3") || icontains(model,"D3S") )
     {
       //Have seen model strings: "D3", "D3S", "D3S 2.02"
       detector_type_ = DetectorType::KromekD3S;
       return;
     }
-    
+
+    if( icontains(model,"D5") )
+    {
+      detector_type_ = DetectorType::KromekD5;
+      return;
+    }
+
+    if( icontains(model,"GR1") )
+    {
+      detector_type_ = DetectorType::KromekGR1;
+      return;
+    }
+
     //Other Kromek instrument models I've seem: "MultiSpect/KSpect"
   }//if( icontains( manufacturer_,"Kromek" ) )
-  
-  
+
+
+  if( icontains(instrument_model_,"Raysid") )
+  {
+    detector_type_ = DetectorType::Raysid;
+    return;
+  }
+
   if( iequals_ascii(instrument_type_,"PVT Portal") && iequals_ascii(manufacturer_,"SAIC") )
   {
     detector_type_ = DetectorType::SAIC8;

src/SpecFile_n42.cpp

@@ -575,14 +575,19 @@ std::string determine_gamma_detector_kind_code( const SpecUtils::SpecFile &sf )
 
     case SpecUtils::DetectorType::MicroRaider:
     case SpecUtils::DetectorType::Interceptor:
+    case SpecUtils::DetectorType::KromekGR1:
       det_kind = "CZT";
       break;
 
     case SpecUtils::DetectorType::KromekD3S:
     case SpecUtils::DetectorType::RadiaCode:
+    case SpecUtils::DetectorType::Raysid:
       det_kind = "CsI";
       break;
-      
+
+    case SpecUtils::DetectorType::KromekD5:
+      det_kind = "CLLBC";
+
     case SpecUtils::DetectorType::Unknown:
     {
       const string &manufacturer = sf.manufacturer();

src/SpecFile_spc.cpp

@@ -1385,6 +1385,9 @@ bool SpecFile::write_binary_spc( std::ostream &output,
     case DetectorType::VerifinderNaI:
     case DetectorType::VerifinderLaBr:
     case DetectorType::KromekD3S:
+    case DetectorType::Raysid:
+    case DetectorType::KromekGR1:
+    case DetectorType::KromekD5:
     case DetectorType::RadiaCode:
     case DetectorType::Fulcrum:
     case DetectorType::Fulcrum40h: