detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-26 16:20:03 +02:00
Code Issues Actions Packages Releases Activity

added 2 gain settings to eigeR

Browse Source
This commit is contained in:
Dhanya Maliakal 2016-08-03 10:35:11 +02:00
parent e1d54b72f8
commit 1db5ef4fd4
5 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
slsDetectorSoftware/commonFiles/sls_detector_defs.h
View File

@ -376,6 +376,7 @@ enum detectorSettings{
FIXGAIN2, /**< fix gain 2 */ FIXGAIN2, /**< fix gain 2 */
FORCESWITCHG1, /**< force switch gain 1 */ FORCESWITCHG1, /**< force switch gain 1 */
FORCESWITCHG2, /**< force switch gain 2 */ FORCESWITCHG2, /**< force switch gain 2 */
VERYLOWGAIN, /**< very low gain settings */
UNDEFINED=200, /**< undefined or custom settings */ UNDEFINED=200, /**< undefined or custom settings */
UNINITIALIZED /**< uninitialiazed (status at startup) */ UNINITIALIZED /**< uninitialiazed (status at startup) */
}; };

BIN
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.0.3.14.1 → slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.0.3.14.2
View File

Binary file not shown.

9
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -3240,7 +3240,8 @@ slsDetectorDefs::detectorSettings slsDetector::setSettings( detectorSettings ise
case VERYHIGHGAIN: case VERYHIGHGAIN:
if ((thisDetector->myDetectorType == GOTTHARD) || if ((thisDetector->myDetectorType == GOTTHARD) ||
(thisDetector->myDetectorType == PROPIX) || (thisDetector->myDetectorType == PROPIX) ||
(thisDetector->myDetectorType == MOENCH)) { (thisDetector->myDetectorType == MOENCH)||
(thisDetector->myDetectorType == EIGER)) {
ssettings="/veryhighgain"; ssettings="/veryhighgain";
thisDetector->currentSettings=VERYHIGHGAIN; thisDetector->currentSettings=VERYHIGHGAIN;
} }
@ -3277,6 +3278,12 @@ slsDetectorDefs::detectorSettings slsDetector::setSettings( detectorSettings ise
thisDetector->currentSettings=FORCESWITCHG2; thisDetector->currentSettings=FORCESWITCHG2;
} }
break; break;
case VERYLOWGAIN:
if (thisDetector->myDetectorType == EIGER) {
ssettings="/verylowgain";
thisDetector->currentSettings=VERYLOWGAIN;
}
break;
default: default:
break; break;
} }

6
slsDetectorSoftware/slsDetector/slsDetectorBase.h
View File

@ -653,7 +653,7 @@ class slsDetectorBase : public virtual slsDetectorDefs, public virtual errorDef
\param s can be STANDARD, FAST, HIGHGAIN, DYNAMICGAIN, LOWGAIN, MEDIUMGAIN, VERYHIGHGAIN, LOWNOISE, \param s can be STANDARD, FAST, HIGHGAIN, DYNAMICGAIN, LOWGAIN, MEDIUMGAIN, VERYHIGHGAIN, LOWNOISE,
DYNAMICHG0, FIXGAIN1, FIXGAIN2, FORCESWITCHG1, FORCESWITCHG2, GET_SETTINGS DYNAMICHG0, FIXGAIN1, FIXGAIN2, FORCESWITCHG1, FORCESWITCHG2, GET_SETTINGS
\returns standard, fast, highgain, dynamicgain, lowgain, mediumgain, veryhighgain, lownoise, \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){\ static string getDetectorSettings(detectorSettings s){\
switch(s) { \ switch(s) { \
@ -670,6 +670,7 @@ class slsDetectorBase : public virtual slsDetectorDefs, public virtual errorDef
case FIXGAIN2: return string("fixgain2"); \ case FIXGAIN2: return string("fixgain2"); \
case FORCESWITCHG1: return string("forceswitchg1");\ case FORCESWITCHG1: return string("forceswitchg1");\
case FORCESWITCHG2: return string("forceswitchg2");\ case FORCESWITCHG2: return string("forceswitchg2");\
case VERYLOWGAIN: return string("verylowgain");\
default: return string("undefined"); \ 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, \param s can be standard, fast, highgain, dynamicgain, lowgain, mediumgain, veryhighgain, lownoise,
dynamichg0, fixgain1, fixgain2, forceswitchg1, forceswitchg2, undefined dynamichg0, fixgain1, fixgain2, forceswitchg1, forceswitchg2, undefined
\returns setting index STANDARD, FAST, HIGHGAIN, DYNAMICGAIN, LOWGAIN, MEDIUMGAIN, VERYHIGHGAIN,LOWNOISE, \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){ \ static detectorSettings getDetectorSettings(string s){ \
@ -694,6 +695,7 @@ class slsDetectorBase : public virtual slsDetectorDefs, public virtual errorDef
if (s=="fixgain2") return FIXGAIN2; \ if (s=="fixgain2") return FIXGAIN2; \
if (s=="forceswitchg1") return FORCESWITCHG1; \ if (s=="forceswitchg1") return FORCESWITCHG1; \
if (s=="forceswitchg2") return FORCESWITCHG2; \ if (s=="forceswitchg2") return FORCESWITCHG2; \
if (s=="verylowgain") return VERYLOWGAIN; \
return GET_SETTINGS; \ return GET_SETTINGS; \
}; };

2
slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c
View File

@ -1929,6 +1929,8 @@ int set_module(int file_des) {
case STANDARD: case STANDARD:
case HIGHGAIN: case HIGHGAIN:
case LOWGAIN: case LOWGAIN:
case VERYHIGHGAIN:
case VERYLOWGAIN:
break; break;
default: default:
sprintf(mess,"This setting %d does not exist for this detector\n",myModule.reg); sprintf(mess,"This setting %d does not exist for this detector\n",myModule.reg);