detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-23 18:17:59 +02:00
Code Issues Actions Packages Releases Activity

Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software

Browse Source
This commit is contained in:
Dhanya Maliakal
2015-11-13 17:49:36 +01:00
parent c43af96487 fa80d6a205
commit f68d6d0ab6
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -3097,7 +3097,8 @@ slsDetectorDefs::detectorSettings slsDetector::setSettings( detectorSettings ise
case LOWGAIN: case LOWGAIN:
if ((thisDetector->myDetectorType == GOTTHARD) || if ((thisDetector->myDetectorType == GOTTHARD) ||
(thisDetector->myDetectorType == PROPIX) || (thisDetector->myDetectorType == PROPIX) ||
(thisDetector->myDetectorType == MOENCH)) { (thisDetector->myDetectorType == MOENCH) ||
(thisDetector->myDetectorType == EIGER) ) {
ssettings="/lowgain"; ssettings="/lowgain";
thisDetector->currentSettings=LOWGAIN; thisDetector->currentSettings=LOWGAIN;
} }
@ -3119,10 +3120,6 @@ slsDetectorDefs::detectorSettings slsDetector::setSettings( detectorSettings ise
} }
break; break;
case LOWNOISE: case LOWNOISE:
if (thisDetector->myDetectorType == EIGER){
ssettings="/lownoise";
thisDetector->currentSettings=LOWNOISE;
}
break; break;
default: default:
break; break;

2
slsDetectorSoftware/slsDetector/slsDetectorBase.h
View File

@ -650,6 +650,7 @@ class slsDetectorBase : public virtual slsDetectorDefs, public virtual errorDef
case LOWGAIN: return string("lowgain"); \ case LOWGAIN: return string("lowgain"); \
case MEDIUMGAIN: return string("mediumgain"); \ case MEDIUMGAIN: return string("mediumgain"); \
case VERYHIGHGAIN: return string("veryhighgain"); \ case VERYHIGHGAIN: return string("veryhighgain"); \
case LOWNOISE: return string("lownoise"); \
default: return string("undefined"); \ default: return string("undefined"); \
}}; }};
@ -666,6 +667,7 @@ class slsDetectorBase : public virtual slsDetectorDefs, public virtual errorDef
if (s=="lowgain") return LOWGAIN; \ if (s=="lowgain") return LOWGAIN; \
if (s=="mediumgain") return MEDIUMGAIN; \ if (s=="mediumgain") return MEDIUMGAIN; \
if (s=="veryhighgain") return VERYHIGHGAIN; \ if (s=="veryhighgain") return VERYHIGHGAIN; \
if (s=="lownoise") return LOWNOISE; \
return GET_SETTINGS; \ return GET_SETTINGS; \
}; };