almost done with ctb update, need to do slow adcs, split to moench and ctb

This commit is contained in:
2018-11-30 10:39:26 +01:00
parent c19c787904
commit 8f3f9caf2b
110 changed files with 4526 additions and 14397 deletions

View File

@ -582,7 +582,7 @@ int slsReceiverTCPIPInterface::set_detector_type(){
switch(arg) {
case GOTTHARD:
case EIGER:
case JUNGFRAUCTB:
case CHIPTESTBOARD:
case JUNGFRAU:
break;
default:
@ -804,7 +804,7 @@ int slsReceiverTCPIPInterface::set_timer() {
receiver->setSubPeriod(index[1] + receiver->getSubExpTime());
break;
case SAMPLES_JCTB:
if (myDetectorType != JUNGFRAUCTB) {
if (myDetectorType != CHIPTESTBOARD) {
modeNotImplemented("(Samples) Timer index", (int)index[0]);
break;
}
@ -836,7 +836,7 @@ int slsReceiverTCPIPInterface::set_timer() {
retval=(receiver->getSubPeriod() - receiver->getSubExpTime());
break;
case SAMPLES_JCTB:
if (myDetectorType != JUNGFRAUCTB) {
if (myDetectorType != CHIPTESTBOARD) {
ret = FAIL;
sprintf(mess,"This timer mode (%lld) does not exist for this receiver type\n", (long long int)index[0]);
FILE_LOG(logERROR) << "Warning: " << mess;