revised gain plot; updated version api

slsSupportLib/include/ToString.h

@@ -91,6 +91,22 @@ inline std::string ToString(const defs::detectorSettings s) {
         return std::string("forceswitchg2");
     case defs::VERYLOWGAIN:
         return std::string("verylowgain");
+    case defs::G1_HIGHGAIN:
+        return std::string("g1_hg");
+    case defs::G1_LOWGAIN:
+        return std::string("g1_lg");
+    case defs::G2_HIGHCAP_HIGHGAIN:
+        return std::string("g2_hc_hg");
+    case defs::G2_HIGHCAP_LOWGAIN:
+        return std::string("g2_hc_lg");
+    case defs::G2_LOWCAP_HIGHGAIN:
+        return std::string("g2_lc_hg");
+    case defs::G2_LOWCAP_LOWGAIN:
+        return std::string("g2_lc_lg");
+    case defs::G4_HIGHGAIN:
+        return std::string("g4_hg");
+    case defs::G4_LOWGAIN:
+        return std::string("g4_lg");
     case defs::UNDEFINED:
         return std::string("undefined");        
     case defs::UNINITIALIZED:
@@ -459,6 +475,22 @@ inline defs::detectorSettings StringTo(const std::string& s) {
         return defs::FORCESWITCHG2;
     if (s == "verylowgain")
         return defs::VERYLOWGAIN;
+    if (s == "g1_hg")
+        return defs::G1_HIGHGAIN;
+    if (s == "g1_lg")
+        return defs::G1_LOWGAIN;
+    if (s == "g2_hc_hg")
+        return defs::G2_HIGHCAP_HIGHGAIN;
+    if (s == "g2_hc_lg")
+        return defs::G2_HIGHCAP_LOWGAIN;
+    if (s == "g2_lc_hg")
+        return defs::G2_LOWCAP_HIGHGAIN;
+    if (s == "g2_lc_lg")
+        return defs::G2_LOWCAP_LOWGAIN;
+    if (s == "g4_hg")
+        return defs::G4_HIGHGAIN;
+    if (s == "g4_lg")
+        return defs::G4_LOWGAIN;
     throw sls::RuntimeError("Unknown setting " + s);
 }
 

slsSupportLib/include/sls_detector_defs.h

@@ -332,6 +332,11 @@ class slsDetectorDefs {
         VB_PIXBUF,
         VIN_COM,
         VDD_PROT,
+        VBP_COLBUF,
+        VB_SDA,
+        VCASC_SFP,
+        VIPRE_CDS,
+        IBIAS_SFP,
         V_POWER_A = 100,
         V_POWER_B = 101,
         V_POWER_C = 102,
@@ -359,20 +364,28 @@ class slsDetectorDefs {
        detector settings indexes
     */
     enum detectorSettings {
-        GET_SETTINGS = -1, /**< return current detector settings */
-        STANDARD,          /**< standard settings */
-        FAST,              /**< fast settings */
-        HIGHGAIN,          /**< highgain  settings */
-        DYNAMICGAIN,       /**< dynamic gain  settings */
-        LOWGAIN,           /**< low gain  settings */
-        MEDIUMGAIN,        /**< medium gain  settings */
-        VERYHIGHGAIN,      /**< very high gain  settings */
-        DYNAMICHG0,        /**< dynamic high gain 0 */
-        FIXGAIN1,          /**< fix gain 1 */
-        FIXGAIN2,          /**< fix gain 2 */
-        FORCESWITCHG1,     /**< force switch gain 1 */
-        FORCESWITCHG2,     /**< force switch gain 2 */
-        VERYLOWGAIN,       /**< very low gain settings */
+        GET_SETTINGS = -1, 
+        STANDARD,          
+        FAST,              
+        HIGHGAIN,          
+        DYNAMICGAIN,       
+        LOWGAIN,           
+        MEDIUMGAIN,        
+        VERYHIGHGAIN,      
+        DYNAMICHG0,        
+        FIXGAIN1,          
+        FIXGAIN2,          
+        FORCESWITCHG1,     
+        FORCESWITCHG2,     
+        VERYLOWGAIN,       
+        G1_HIGHGAIN,
+        G1_LOWGAIN,
+        G2_HIGHCAP_HIGHGAIN,
+        G2_HIGHCAP_LOWGAIN,
+        G2_LOWCAP_HIGHGAIN,
+        G2_LOWCAP_LOWGAIN,
+        G4_HIGHGAIN,
+        G4_LOWGAIN,
         UNDEFINED = 200,   /**< undefined or custom  settings */
         UNINITIALIZED      /**< uninitialiazed (status at startup) */
     };

slsSupportLib/include/versionAPI.h

@@ -1,6 +1,5 @@
 /** API versions */
 #define GITBRANCH "developer"
-#define APIMOENCH 0x200131
 #define APIMYTHEN3 0x200226
 #define APIJUNGFRAU 0x200226
 #define APIEIGER 0x200226
@@ -9,4 +8,5 @@
 #define APIRECEIVER 0x200227
 #define APIGUI 0x200227
 #define APICTB 0x200227
+#define APIMOENCH 0x200303
 #define APIGOTTHARD2 0x200304