From fa80d6a205a29164eb5cfab47bbd0f8f8646f68b Mon Sep 17 00:00:00 2001 From: l_msdetect Date: Fri, 13 Nov 2015 11:43:19 +0100 Subject: [PATCH] change settings for eiger --- slsDetectorSoftware/slsDetector/slsDetector.cpp | 7 ++----- slsDetectorSoftware/slsDetector/slsDetectorBase.h | 4 +++- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp index a6d8b5fce..f732cb0d0 100644 --- a/slsDetectorSoftware/slsDetector/slsDetector.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp @@ -3097,7 +3097,8 @@ slsDetectorDefs::detectorSettings slsDetector::setSettings( detectorSettings ise case LOWGAIN: if ((thisDetector->myDetectorType == GOTTHARD) || (thisDetector->myDetectorType == PROPIX) || - (thisDetector->myDetectorType == MOENCH)) { + (thisDetector->myDetectorType == MOENCH) || + (thisDetector->myDetectorType == EIGER) ) { ssettings="/lowgain"; thisDetector->currentSettings=LOWGAIN; } @@ -3119,10 +3120,6 @@ slsDetectorDefs::detectorSettings slsDetector::setSettings( detectorSettings ise } break; case LOWNOISE: - if (thisDetector->myDetectorType == EIGER){ - ssettings="/lownoise"; - thisDetector->currentSettings=LOWNOISE; - } break; default: break; diff --git a/slsDetectorSoftware/slsDetector/slsDetectorBase.h b/slsDetectorSoftware/slsDetector/slsDetectorBase.h index 6cf0a203a..22d1ee691 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorBase.h +++ b/slsDetectorSoftware/slsDetector/slsDetectorBase.h @@ -650,6 +650,7 @@ class slsDetectorBase : public virtual slsDetectorDefs, public virtual errorDef case LOWGAIN: return string("lowgain"); \ case MEDIUMGAIN: return string("mediumgain"); \ case VERYHIGHGAIN: return string("veryhighgain"); \ + case LOWNOISE: return string("lownoise"); \ default: return string("undefined"); \ }}; @@ -666,7 +667,8 @@ class slsDetectorBase : public virtual slsDetectorDefs, public virtual errorDef if (s=="lowgain") return LOWGAIN; \ if (s=="mediumgain") return MEDIUMGAIN; \ if (s=="veryhighgain") return VERYHIGHGAIN; \ - return GET_SETTINGS; \ + if (s=="lownoise") return LOWNOISE; \ + return GET_SETTINGS; \ };