detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-11 12:27:14 +02:00
Code Issues Actions Packages Releases Activity

gotthard settings name change again

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@71 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2011-11-28 15:18:44 +00:00
parent 5c4dfacadb
commit 05705a907a
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -2681,15 +2681,15 @@ detectorSettings slsDetector::setSettings( detectorSettings isettings, int imod)
break; break;
case LOWGAIN: case LOWGAIN:
ssettings="/lowgain"; ssettings="/lowgain";
thisDetector->currentSettings=GAIN1; thisDetector->currentSettings=LOWGAIN;
break; break;
case MEDIUMGAIN: case MEDIUMGAIN:
ssettings="/mediumgain"; ssettings="/mediumgain";
thisDetector->currentSettings=GAIN2; thisDetector->currentSettings=MEDIUMGAIN;
break; break;
case VERYHIGHGAIN: case VERYHIGHGAIN:
ssettings="/veryhighgain"; ssettings="/veryhighgain";
thisDetector->currentSettings=GAIN3; thisDetector->currentSettings=VERYHIGHGAIN;
break; break;
default: default:
std::cout<< "Unknown settings!" << std::endl; std::cout<< "Unknown settings!" << std::endl;
@ -5532,12 +5532,12 @@ string slsDetector::executeLine(int narg, char *args[], int action) {
sett=HIGHGAIN; sett=HIGHGAIN;
else if (sval=="dynamicgain") else if (sval=="dynamicgain")
sett=DYNAMICGAIN; sett=DYNAMICGAIN;
else if (sval=="gain1") else if (sval=="lowgain")
sett=GAIN1; sett=LOWGAIN;
else if (sval=="gain2") else if (sval=="mediumgain")
sett=GAIN2; sett=MEDIUMGAIN;
else if (sval=="gain3") else if (sval=="veryhighgain")
sett=GAIN3; sett=VERYHIGHGAIN;
else { else {
sprintf(answer,"%s not defined for this detector",sval.c_str()); sprintf(answer,"%s not defined for this detector",sval.c_str());
return string(answer); return string(answer);
@ -5558,12 +5558,12 @@ string slsDetector::executeLine(int narg, char *args[], int action) {
return string("highgain"); return string("highgain");
case DYNAMICGAIN: case DYNAMICGAIN:
return string("dynamicgain"); return string("dynamicgain");
case GAIN1: case LOWGAIN:
return string("gain1"); return string("lowgain");
case GAIN2: case MEDIUMGAIN:
return string("gain2"); return string("mediumgain");
case GAIN3: case VERYHIGHGAIN:
return string("gain3"); return string("veryhighgain");
default: default:
return string("undefined"); return string("undefined");
} }