From cd28aaa3505fc589e25be20a01783474783a64e2 Mon Sep 17 00:00:00 2001 From: l_maliakal_d Date: Mon, 28 Nov 2011 12:56:37 +0000 Subject: [PATCH] gotthard: changed settings names git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@66 951219d9-93cf-4727-9268-0efd64621fa3 --- .../commonFiles/sls_detector_defs.h | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/slsDetectorSoftware/commonFiles/sls_detector_defs.h b/slsDetectorSoftware/commonFiles/sls_detector_defs.h index c212795f5..b95ed0f9e 100755 --- a/slsDetectorSoftware/commonFiles/sls_detector_defs.h +++ b/slsDetectorSoftware/commonFiles/sls_detector_defs.h @@ -262,8 +262,7 @@ enum dacIndex { G_VCASC_OUT, /**< gotthard */ G_VIN_CM, /**< gotthard */ G_VREF_COMP, /**< gotthard */ - G_IB_TESTC, /**< gotthard */ - G_CONF_GAIN /**< gotthard gain for the dacs */ + G_IB_TESTC /**< gotthard */ }; /** @@ -271,15 +270,15 @@ enum dacIndex { */ enum detectorSettings{ GET_SETTINGS=-1, /**< return current detector settings */ - STANDARD, /**< standard settings */ - FAST, /**< fast settings */ - HIGHGAIN, /**< highgain settings */ - DYNAMICGAIN, /**< dynamic gain settings */ - GAIN1, /**< gain 1 settings */ - GAIN2, /**< gain 2 settings */ - GAIN3, /**< gain 3 settings */ - UNDEFINED, /**< undefined or custom settings */ - UNINITIALIZED /**< uninitialiazed (status at startup) */ + 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 */ + UNDEFINED, /**< undefined or custom settings */ + UNINITIALIZED /**< uninitialiazed (status at startup) */ }; /** meaning of the channel register bits