From 1db5ef4fd49c3297a05d40c55471ce57896898ed Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Wed, 3 Aug 2016 10:35:11 +0200 Subject: [PATCH] added 2 gain settings to eigeR --- .../commonFiles/sls_detector_defs.h | 1 + ....3.14.1 => eigerDetectorServerv2.0.3.14.2} | Bin 277260 -> 277301 bytes .../slsDetector/slsDetector.cpp | 9 ++++++++- .../slsDetector/slsDetectorBase.h | 6 ++++-- .../slsDetectorServer_funcs.c | 2 ++ 5 files changed, 15 insertions(+), 3 deletions(-) rename slsDetectorSoftware/eigerDetectorServer/bin/{eigerDetectorServerv2.0.3.14.1 => eigerDetectorServerv2.0.3.14.2} (72%) diff --git a/slsDetectorSoftware/commonFiles/sls_detector_defs.h b/slsDetectorSoftware/commonFiles/sls_detector_defs.h index dde67c21f..e07b1f15d 100755 --- a/slsDetectorSoftware/commonFiles/sls_detector_defs.h +++ b/slsDetectorSoftware/commonFiles/sls_detector_defs.h @@ -376,6 +376,7 @@ enum detectorSettings{ FIXGAIN2, /**< fix gain 2 */ FORCESWITCHG1, /**< force switch gain 1 */ FORCESWITCHG2, /**< force switch gain 2 */ + VERYLOWGAIN, /**< very low gain settings */ UNDEFINED=200, /**< undefined or custom settings */ UNINITIALIZED /**< uninitialiazed (status at startup) */ }; diff --git a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.0.3.14.1 b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.0.3.14.2 similarity index 72% rename from slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.0.3.14.1 rename to slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.0.3.14.2 index 2596bcc9532a33ea0168dc01fddbdba505c62d8a..0fe8abc7af4d922d2214de50afd47882ab684bbe 100755 GIT binary patch delta 22233 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 delta 21911 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 Cis={t diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp index f891874b5..b6c1c5f06 100644 --- a/slsDetectorSoftware/slsDetector/slsDetector.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp @@ -3240,7 +3240,8 @@ slsDetectorDefs::detectorSettings slsDetector::setSettings( detectorSettings ise case VERYHIGHGAIN: if ((thisDetector->myDetectorType == GOTTHARD) || (thisDetector->myDetectorType == PROPIX) || - (thisDetector->myDetectorType == MOENCH)) { + (thisDetector->myDetectorType == MOENCH)|| + (thisDetector->myDetectorType == EIGER)) { ssettings="/veryhighgain"; thisDetector->currentSettings=VERYHIGHGAIN; } @@ -3277,6 +3278,12 @@ slsDetectorDefs::detectorSettings slsDetector::setSettings( detectorSettings ise thisDetector->currentSettings=FORCESWITCHG2; } break; + case VERYLOWGAIN: + if (thisDetector->myDetectorType == EIGER) { + ssettings="/verylowgain"; + thisDetector->currentSettings=VERYLOWGAIN; + } + break; default: break; } diff --git a/slsDetectorSoftware/slsDetector/slsDetectorBase.h b/slsDetectorSoftware/slsDetector/slsDetectorBase.h index 6a6612114..62eb83006 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorBase.h +++ b/slsDetectorSoftware/slsDetector/slsDetectorBase.h @@ -653,7 +653,7 @@ class slsDetectorBase : public virtual slsDetectorDefs, public virtual errorDef \param s can be STANDARD, FAST, HIGHGAIN, DYNAMICGAIN, LOWGAIN, MEDIUMGAIN, VERYHIGHGAIN, LOWNOISE, DYNAMICHG0, FIXGAIN1, FIXGAIN2, FORCESWITCHG1, FORCESWITCHG2, GET_SETTINGS \returns standard, fast, highgain, dynamicgain, lowgain, mediumgain, veryhighgain, lownoise, - dynamichg0, fixgain1, fixgain2, forceswitchg1, forceswitchg2, undefined + dynamichg0, fixgain1, fixgain2, forceswitchg1, forceswitchg2, verylowgain, undefined */ static string getDetectorSettings(detectorSettings s){\ switch(s) { \ @@ -670,6 +670,7 @@ class slsDetectorBase : public virtual slsDetectorDefs, public virtual errorDef case FIXGAIN2: return string("fixgain2"); \ case FORCESWITCHG1: return string("forceswitchg1");\ case FORCESWITCHG2: return string("forceswitchg2");\ + case VERYLOWGAIN: return string("verylowgain");\ default: return string("undefined"); \ }}; @@ -677,7 +678,7 @@ class slsDetectorBase : public virtual slsDetectorDefs, public virtual errorDef \param s can be standard, fast, highgain, dynamicgain, lowgain, mediumgain, veryhighgain, lownoise, dynamichg0, fixgain1, fixgain2, forceswitchg1, forceswitchg2, undefined \returns setting index STANDARD, FAST, HIGHGAIN, DYNAMICGAIN, LOWGAIN, MEDIUMGAIN, VERYHIGHGAIN,LOWNOISE, - DYNAMICHG0, FIXGAIN1, FIXGAIN2, FORCESWITCHG1, FORCESWITCHG2, GET_SETTINGS + DYNAMICHG0, FIXGAIN1, FIXGAIN2, FORCESWITCHG1, FORCESWITCHG2, VERYLOWGAIN, GET_SETTINGS */ static detectorSettings getDetectorSettings(string s){ \ @@ -694,6 +695,7 @@ class slsDetectorBase : public virtual slsDetectorDefs, public virtual errorDef if (s=="fixgain2") return FIXGAIN2; \ if (s=="forceswitchg1") return FORCESWITCHG1; \ if (s=="forceswitchg2") return FORCESWITCHG2; \ + if (s=="verylowgain") return VERYLOWGAIN; \ return GET_SETTINGS; \ }; diff --git a/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c b/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c index e18f6ffd6..599c681ad 100755 --- a/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c +++ b/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c @@ -1929,6 +1929,8 @@ int set_module(int file_des) { case STANDARD: case HIGHGAIN: case LOWGAIN: + case VERYHIGHGAIN: + case VERYLOWGAIN: break; default: sprintf(mess,"This setting %d does not exist for this detector\n",myModule.reg);