diff --git a/python/scripts/cmd_python.py b/python/scripts/cmd_python.py index e3637eb7e..a76812c82 100644 --- a/python/scripts/cmd_python.py +++ b/python/scripts/cmd_python.py @@ -10,7 +10,7 @@ pycmd = dir(Detector)+dir(Eiger)+dir(Ctb) pycmd += ['vrf', 'vtr', 'vrs', 'vtgstv', 'vsvn', 'vtrim', 'vsvp', 'vth1', 'vth2', 'vth3', 'vshaper', 'vshaperneg', 'rxb_rb', -'rxb_lb', 'vref_prech', 'vref_restore', 'vref_cds', +'rxb_lb', 'vref_prech', 'vref_rstore', 'vref_cds', 'vpreamp', 'vref_comp', 'vref_comp_fe vref_ds', 'vref_h_adc', 'vref_l_adc', 'iodelay', 'list', 'vref_ds', 'vis', 'vpl', 'vref_comp_fe', 'vph', 'vout_cm', 'vcp', 'vcn', 'vcmp_ll', 'vcmp_lr' diff --git a/python/src/enums.cpp b/python/src/enums.cpp index 9ddd0049a..9006aa002 100644 --- a/python/src/enums.cpp +++ b/python/src/enums.cpp @@ -169,7 +169,7 @@ void init_enums(py::module &m) { .value("VB_COMP_FE", slsDetectorDefs::dacIndex::VB_COMP_FE) .value("VB_COMP_ADC", slsDetectorDefs::dacIndex::VB_COMP_ADC) .value("VCOM_CDS", slsDetectorDefs::dacIndex::VCOM_CDS) - .value("VREF_RESTORE", slsDetectorDefs::dacIndex::VREF_RESTORE) + .value("VREF_RSTORE", slsDetectorDefs::dacIndex::VREF_RSTORE) .value("VB_OPA_1ST", slsDetectorDefs::dacIndex::VB_OPA_1ST) .value("VREF_COMP_FE", slsDetectorDefs::dacIndex::VREF_COMP_FE) .value("VCOM_ADC1", slsDetectorDefs::dacIndex::VCOM_ADC1) diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer index 22e4b55aa..10e68bd22 100755 Binary files a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer and b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer differ diff --git a/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c index 40bd95fc3..1b1cc46ab 100755 --- a/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c @@ -1418,22 +1418,18 @@ int setHighVoltage(int val){ void setTiming( enum timingMode arg){ - - if(arg != GET_TIMING_MODE){ - switch(arg){ - case AUTO_TIMING: - FILE_LOG(logINFO, ("Set Timing: Auto\n")); - bus_w(EXT_SIGNAL_REG, bus_r(EXT_SIGNAL_REG) & ~EXT_SIGNAL_MSK); - break; - case TRIGGER_EXPOSURE: - FILE_LOG(logINFO, ("Set Timing: Trigger\n")); - bus_w(EXT_SIGNAL_REG, bus_r(EXT_SIGNAL_REG) | EXT_SIGNAL_MSK); - break; - default: - FILE_LOG(logERROR, ("Unknown timing mode %d\n", arg)); - return; - } - } + switch(arg){ + case AUTO_TIMING: + FILE_LOG(logINFO, ("Set Timing: Auto\n")); + bus_w(EXT_SIGNAL_REG, bus_r(EXT_SIGNAL_REG) & ~EXT_SIGNAL_MSK); + break; + case TRIGGER_EXPOSURE: + FILE_LOG(logINFO, ("Set Timing: Trigger\n")); + bus_w(EXT_SIGNAL_REG, bus_r(EXT_SIGNAL_REG) | EXT_SIGNAL_MSK); + break; + default: + FILE_LOG(logERROR, ("Unknown timing mode %d\n", arg)); + } } diff --git a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer index 4916ac20d..4f0b57f1b 100755 Binary files a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer and b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer differ diff --git a/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c index 20009bde4..84d33932e 100755 --- a/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c @@ -1106,36 +1106,46 @@ int setHighVoltage(int val) { /* parameters - timing, extsig */ void setTiming( enum timingMode arg) { - enum timingMode ret=GET_TIMING_MODE; - if (arg != GET_TIMING_MODE) { - switch(arg) { - case AUTO_TIMING: ret = 0; break; - case TRIGGER_EXPOSURE: ret = 2; break; - case BURST_TRIGGER: ret = 1; break; - case GATED: ret = 3; break; - } - FILE_LOG(logDEBUG1, ("Setting Triggering Mode: %d\n", (int)ret)); -#ifndef VIRTUAL - if (Feb_Control_SetTriggerMode(ret,1)) -#endif - eiger_triggermode = ret; + int ret = 0; + switch(arg) { + case AUTO_TIMING: + ret = 0; + break; + case TRIGGER_EXPOSURE: + ret = 2; + break; + case BURST_TRIGGER: + ret = 1; + break; + case GATED: + ret = 3; + break; + default: + FILE_LOG(logERROR, ("Unknown timing mode %d\n", arg)); + return; } + FILE_LOG(logDEBUG1, ("Setting Triggering Mode: %d\n", (int)ret)); +#ifndef VIRTUAL + if (Feb_Control_SetTriggerMode(ret,1)) +#endif + eiger_triggermode = ret; } enum timingMode getTiming() { - enum timingMode ret = GET_TIMING_MODE; - ret = eiger_triggermode; - switch((int)ret) { - case 0: ret = AUTO_TIMING; break; - case 2: ret = TRIGGER_EXPOSURE; break; - case 1: ret = BURST_TRIGGER; break; - case 3: ret = GATED; break; + switch(eiger_triggermode) { + case 0: + return AUTO_TIMING; + case 2: + return TRIGGER_EXPOSURE; + case 1: + return BURST_TRIGGER; + case 3: + return GATED; default: - FILE_LOG(logERROR, ("Unknown trigger mode found %d\n", ret)); - ret = 0; + FILE_LOG(logERROR, ("Unknown trigger mode found %d\n", eiger_triggermode)); + return GET_TIMING_MODE; } - return ret; } diff --git a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer index 3c23a5252..cb3b405d9 100755 Binary files a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer and b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer differ diff --git a/slsDetectorServers/gotthard2DetectorServer/config.txt b/slsDetectorServers/gotthard2DetectorServer/config.txt index ebbfc5104..e90b1f495 100755 --- a/slsDetectorServers/gotthard2DetectorServer/config.txt +++ b/slsDetectorServers/gotthard2DetectorServer/config.txt @@ -11,7 +11,7 @@ vref_h_adc 2099 vb_comp_fe 0 vb_comp_adc 0 vcom_cds 1400 -vref_restore 640 +vref_rstore 640 vb_opa_1st 0 vref_comp_fe 0 vcom_adc1 1400 diff --git a/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c index b6759459d..370f42ce7 100644 --- a/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c @@ -626,8 +626,8 @@ int readConfigFile() { idac = G2_VB_COMP_ADC; } else if (!strcasecmp(command,"vcom_cds")) { idac = G2_VCOM_CDS; - } else if (!strcasecmp(command,"vref_restore")) { - idac = G2_VREF_RESTORE; + } else if (!strcasecmp(command,"vref_rstore")) { + idac = G2_VREF_RSTORE; } else if (!strcasecmp(command,"vb_opa_1st")) { idac = G2_VB_OPA_1ST; } else if (!strcasecmp(command,"vref_comp_fe")) { @@ -1091,21 +1091,18 @@ int setHighVoltage(int val){ /* parameters - timing */ void setTiming( enum timingMode arg){ - if(arg != GET_TIMING_MODE){ - switch(arg){ - case AUTO_TIMING: - FILE_LOG(logINFO, ("Set Timing: Auto\n")); - bus_w(EXT_SIGNAL_REG, bus_r(EXT_SIGNAL_REG) & ~EXT_SIGNAL_MSK); - break; - case TRIGGER_EXPOSURE: - FILE_LOG(logINFO, ("Set Timing: Trigger\n")); - bus_w(EXT_SIGNAL_REG, bus_r(EXT_SIGNAL_REG) | EXT_SIGNAL_MSK); - break; - default: - FILE_LOG(logERROR, ("Unknown timing mode %d\n", arg)); - return; - } - } + switch(arg){ + case AUTO_TIMING: + FILE_LOG(logINFO, ("Set Timing: Auto\n")); + bus_w(EXT_SIGNAL_REG, bus_r(EXT_SIGNAL_REG) & ~EXT_SIGNAL_MSK); + break; + case TRIGGER_EXPOSURE: + FILE_LOG(logINFO, ("Set Timing: Trigger\n")); + bus_w(EXT_SIGNAL_REG, bus_r(EXT_SIGNAL_REG) | EXT_SIGNAL_MSK); + break; + default: + FILE_LOG(logERROR, ("Unknown timing mode %d\n", arg)); + } } enum timingMode getTiming() { @@ -1945,9 +1942,19 @@ void* start_timer(void* arg) { int numFrames = (getNumFrames() * getNumTriggers() ); int64_t exp_ns = getExpTime(); - int datasize = 2560; + int imagesize = NCHAN * NCHIP * 2; + int datasize = imagesize; int packetsize = datasize + sizeof(sls_detector_header); + // Generate data + char imageData[imagesize]; + memset(imageData, 0, imagesize); + { + int i = 0; + for (i = 0; i < imagesize; i += sizeof(uint8_t)) { + *((uint8_t*)(imageData + i)) = i; + } + } int frameNr = 0; // loop over number of frames @@ -1974,7 +1981,10 @@ void* start_timer(void* arg) { header->row = detPos[X]; header->column = detPos[Y]; header->detType = (uint16_t)myDetectorType; - header->version = SLS_DETECTOR_HEADER_VERSION - 1; + header->version = SLS_DETECTOR_HEADER_VERSION - 1; + + // fill data + memcpy(packetData + sizeof(sls_detector_header), imageData, datasize); // send 1 packet = 1 frame sendUDPPacket(0, packetData, packetsize); diff --git a/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h index 5d8f54a75..3c880f309 100644 --- a/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h @@ -61,7 +61,7 @@ enum DACINDEX {G2_VREF_H_ADC, /* 0 */ \ G2_VB_COMP_FE, /* 2 */ \ G2_VB_COMP_ADC, /* 3 */ \ G2_VCOM_CDS, /* 4 */ \ - G2_VREF_RESTORE,/* 5 */ \ + G2_VREF_RSTORE,/* 5 */ \ G2_VB_OPA_1ST, /* 6 */ \ G2_VREF_COMP_FE,/* 7 */ \ G2_VCOM_ADC1, /* 8 */ \ @@ -73,7 +73,7 @@ enum DACINDEX {G2_VREF_H_ADC, /* 0 */ \ G2_DAC_UNUSED2, /* 14 */ \ G2_VCOM_ADC2 /* 15*/ \ }; -#define DAC_NAMES "vref_h_adc", "dac_unused", "vb_comp_fe", "vb_comp_adc", "vcom_cds", "vref_restore", "vb_opa_1st", "vref_comp_fe", "vcom_adc1", "vref_prech", "vref_l_adc", "vref_cds", "vb_cs", "vb_opa_fd", "dac_unused2", "vcom_adc2" +#define DAC_NAMES "vref_h_adc", "dac_unused", "vb_comp_fe", "vb_comp_adc", "vcom_cds", "vref_rstore", "vb_opa_1st", "vref_comp_fe", "vcom_adc1", "vref_prech", "vref_l_adc", "vref_cds", "vb_cs", "vb_opa_fd", "dac_unused2", "vcom_adc2" enum ONCHIP_DACINDEX {G2_VCHIP_COMP_FE, /* 0 */ \ G2_VCHIP_OPA_1ST, /* 1 */ \ diff --git a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer index 13cf881f1..6d01cce02 100755 Binary files a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer and b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer differ diff --git a/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c index 39cc7549d..f911da7bc 100755 --- a/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c @@ -1178,27 +1178,23 @@ int setHighVoltage(int val){ void setTiming( enum timingMode arg){ u_int32_t addr = EXT_SIGNAL_REG; - - if (arg != GET_TIMING_MODE){ - switch(arg){ - case AUTO_TIMING: - FILE_LOG(logINFO, ("Set Timing: Auto\n")); - bus_w(addr, EXT_SIGNAL_OFF_VAL); - break; - case TRIGGER_EXPOSURE: - if (signalMode == TRIGGER_IN_FALLING_EDGE) { - FILE_LOG(logINFO, ("Set Timing: Trigger (Falling Edge)\n")); - bus_w(addr, EXT_SIGNAL_TRGGR_IN_FLLNG_VAL); - } else { - FILE_LOG(logINFO, ("Set Timing: Trigger (Rising Edge)\n")); - bus_w(addr, EXT_SIGNAL_TRGGR_IN_RSNG_VAL); - } - break; - default: - FILE_LOG(logERROR, ("Unknown timing mode %d for this detector\n", (int)arg)); - return; - } - } + switch(arg) { + case AUTO_TIMING: + FILE_LOG(logINFO, ("Set Timing: Auto\n")); + bus_w(addr, EXT_SIGNAL_OFF_VAL); + break; + case TRIGGER_EXPOSURE: + if (signalMode == TRIGGER_IN_FALLING_EDGE) { + FILE_LOG(logINFO, ("Set Timing: Trigger (Falling Edge)\n")); + bus_w(addr, EXT_SIGNAL_TRGGR_IN_FLLNG_VAL); + } else { + FILE_LOG(logINFO, ("Set Timing: Trigger (Rising Edge)\n")); + bus_w(addr, EXT_SIGNAL_TRGGR_IN_RSNG_VAL); + } + break; + default: + FILE_LOG(logERROR, ("Unknown timing mode %d for this detector\n", (int)arg)); + } } enum timingMode getTiming() { diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer index 22fcc4d6a..dea0e13bf 100755 Binary files a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer and b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer differ diff --git a/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c index 48a0922a7..d73799c06 100755 --- a/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c @@ -919,22 +919,18 @@ int setHighVoltage(int val){ void setTiming( enum timingMode arg){ - - if(arg != GET_TIMING_MODE){ - switch(arg){ - case AUTO_TIMING: - FILE_LOG(logINFO, ("Set Timing: Auto\n")); - bus_w(EXT_SIGNAL_REG, bus_r(EXT_SIGNAL_REG) & ~EXT_SIGNAL_MSK); - break; - case TRIGGER_EXPOSURE: - FILE_LOG(logINFO, ("Set Timing: Trigger\n")); - bus_w(EXT_SIGNAL_REG, bus_r(EXT_SIGNAL_REG) | EXT_SIGNAL_MSK); - break; - default: - FILE_LOG(logERROR, ("Unknown timing mode %d\n", arg)); - return; - } - } + switch(arg){ + case AUTO_TIMING: + FILE_LOG(logINFO, ("Set Timing: Auto\n")); + bus_w(EXT_SIGNAL_REG, bus_r(EXT_SIGNAL_REG) & ~EXT_SIGNAL_MSK); + break; + case TRIGGER_EXPOSURE: + FILE_LOG(logINFO, ("Set Timing: Trigger\n")); + bus_w(EXT_SIGNAL_REG, bus_r(EXT_SIGNAL_REG) | EXT_SIGNAL_MSK); + break; + default: + FILE_LOG(logERROR, ("Unknown timing mode %d\n", arg)); + } } diff --git a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer index 1c7a9791d..08bb18c8c 100755 Binary files a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer and b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer differ diff --git a/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c index 178100def..a2882b1dd 100644 --- a/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c @@ -1383,13 +1383,7 @@ void* start_timer(void* arg) { getNumTriggers() ); int64_t exp_ns = getExpTime(); - int numCounters = __builtin_popcount(getCounterMask()); - int dr = setDynamicRange(-1); - int imagesize = NCHAN_1_COUNTER * NCHIP * numCounters * - ((dr > 16) ? 4 : // 32 bit - ((dr > 8) ? 2 : // 16 bit - ((dr > 4) ? 0.5 : // 4 bit - 0.125))); // 1 bit + int imagesize = calculateDataBytes(); int datasize = imagesize / PACKETS_PER_FRAME; int packetsize = datasize + sizeof(sls_detector_header); @@ -1568,7 +1562,15 @@ u_int32_t runBusy() { /* common */ int calculateDataBytes() { - return 0; + int numCounters = __builtin_popcount(getCounterMask()); + int dr = setDynamicRange(-1); + int databytes = NCHAN_1_COUNTER * NCHIP * numCounters * + ((dr > 16) ? 4 : // 32 bit + ((dr > 8) ? 2 : // 16 bit + ((dr > 4) ? 0.5 : // 4 bit + 0.125))); // 1 bit + + return databytes; } int getTotalNumberOfChannels() {return (getNumberOfChannelsPerChip() * getNumberOfChips());} diff --git a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c index 2b6a24613..ae8de3832 100755 --- a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c +++ b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c @@ -1000,8 +1000,8 @@ int set_dac(int file_des) { case VCOM_CDS: serverDacIndex = G2_VCOM_CDS; break; - case VREF_RESTORE: - serverDacIndex = G2_VREF_RESTORE; + case VREF_RSTORE: + serverDacIndex = G2_VREF_RSTORE; break; case VB_OPA_1ST: serverDacIndex = G2_VB_OPA_1ST; diff --git a/slsDetectorSoftware/src/CmdProxy.cpp b/slsDetectorSoftware/src/CmdProxy.cpp index 8105f2317..b6fcbf653 100644 --- a/slsDetectorSoftware/src/CmdProxy.cpp +++ b/slsDetectorSoftware/src/CmdProxy.cpp @@ -697,7 +697,7 @@ std::vector CmdProxy::DacCommands() { case defs::GOTTHARD2: return std::vector{ "vref_h_adc", "vb_comp_fe", "vb_comp_adc", "vcom_cds", - "vref_restore", "vb_opa_1st", "vref_comp_fe", "vcom_adc1", + "vref_rstore", "vb_opa_1st", "vref_comp_fe", "vcom_adc1", "vref_prech", "vref_l_adc", "vref_cds", "vb_cs", "vb_opa_fd", "vcom_adc2"}; break; diff --git a/slsDetectorSoftware/src/CmdProxy.h b/slsDetectorSoftware/src/CmdProxy.h index ea679a1f4..4336ceb8d 100644 --- a/slsDetectorSoftware/src/CmdProxy.h +++ b/slsDetectorSoftware/src/CmdProxy.h @@ -648,7 +648,7 @@ class CmdProxy { {"vb_comp_fe", &CmdProxy::vb_comp_fe}, {"vb_comp_adc", &CmdProxy::vb_comp_adc}, {"vcom_cds", &CmdProxy::vcom_cds}, - {"vref_restore", &CmdProxy::vref_restore}, + {"vref_rstore", &CmdProxy::vref_rstore}, {"vb_opa_1st", &CmdProxy::vb_opa_1st}, {"vref_comp_fe", &CmdProxy::vref_comp_fe}, {"vcom_adc1", &CmdProxy::vcom_adc1}, @@ -1231,7 +1231,7 @@ class CmdProxy { DAC_COMMAND(vcom_cds, getDAC, setDAC, defs::VCOM_CDS, "[dac or mv value][(optional unit) mv] \n\t[Gotthard2] Dac for common mode voltage of CDS stage."); - DAC_COMMAND(vref_restore, getDAC, setDAC, defs::VREF_RESTORE, + DAC_COMMAND(vref_rstore, getDAC, setDAC, defs::VREF_RSTORE, "[dac or mv value][(optional unit) mv] \n\t[Gotthard2] Dac for reference charging voltage of temparory storage cell in high gain."); DAC_COMMAND(vb_opa_1st, getDAC, setDAC, defs::VB_OPA_1ST, diff --git a/slsDetectorSoftware/tests/test-CmdProxy-eiger.cpp b/slsDetectorSoftware/tests/test-CmdProxy-eiger.cpp index e4366b8b4..0a3d39f7e 100644 --- a/slsDetectorSoftware/tests/test-CmdProxy-eiger.cpp +++ b/slsDetectorSoftware/tests/test-CmdProxy-eiger.cpp @@ -361,7 +361,7 @@ TEST_CASE("Setting and reading back EIGER dacs", "[.cmd]") { REQUIRE_THROWS(proxy.Call("vb_comp_fe", {}, -1, GET)); REQUIRE_THROWS(proxy.Call("vb_comp_adc", {}, -1, GET)); REQUIRE_THROWS(proxy.Call("vcom_cds", {}, -1, GET)); - REQUIRE_THROWS(proxy.Call("vref_restore", {}, -1, GET)); + REQUIRE_THROWS(proxy.Call("vref_rstore", {}, -1, GET)); REQUIRE_THROWS(proxy.Call("vb_opa_1st", {}, -1, GET)); REQUIRE_THROWS(proxy.Call("vref_comp_fe", {}, -1, GET)); REQUIRE_THROWS(proxy.Call("vcom_adc1", {}, -1, GET)); diff --git a/slsDetectorSoftware/tests/test-CmdProxy-mythen3.cpp b/slsDetectorSoftware/tests/test-CmdProxy-mythen3.cpp index 18511ed60..406d43d66 100644 --- a/slsDetectorSoftware/tests/test-CmdProxy-mythen3.cpp +++ b/slsDetectorSoftware/tests/test-CmdProxy-mythen3.cpp @@ -69,7 +69,7 @@ TEST_CASE("Setting and reading back MYTHEN3 dacs", "[.cmd][.dacs]") { REQUIRE_THROWS(proxy.Call("vb_comp_fe", {}, -1, GET)); REQUIRE_THROWS(proxy.Call("vb_comp_adc", {}, -1, GET)); REQUIRE_THROWS(proxy.Call("vcom_cds", {}, -1, GET)); - REQUIRE_THROWS(proxy.Call("vref_restore", {}, -1, GET)); + REQUIRE_THROWS(proxy.Call("vref_rstore", {}, -1, GET)); REQUIRE_THROWS(proxy.Call("vb_opa_1st", {}, -1, GET)); REQUIRE_THROWS(proxy.Call("vref_comp_fe", {}, -1, GET)); REQUIRE_THROWS(proxy.Call("vcom_adc1", {}, -1, GET)); diff --git a/slsDetectorSoftware/tests/test-CmdProxy.cpp b/slsDetectorSoftware/tests/test-CmdProxy.cpp index 83dd8f1ce..15cded029 100644 --- a/slsDetectorSoftware/tests/test-CmdProxy.cpp +++ b/slsDetectorSoftware/tests/test-CmdProxy.cpp @@ -311,7 +311,7 @@ TEST_CASE("type", "[.cmd]"){ // REQUIRE_THROWS(multiSlsDetectorClient("vb_comp_fe", GET)); // REQUIRE_THROWS(multiSlsDetectorClient("vb_comp_adc", GET)); // REQUIRE_THROWS(multiSlsDetectorClient("vcom_cds", GET)); -// REQUIRE_THROWS(multiSlsDetectorClient("vref_restore", GET)); +// REQUIRE_THROWS(multiSlsDetectorClient("vref_rstore", GET)); // REQUIRE_THROWS(multiSlsDetectorClient("vb_opa_1st", GET)); // REQUIRE_THROWS(multiSlsDetectorClient("vref_comp_fe", GET)); // REQUIRE_THROWS(multiSlsDetectorClient("vcom_adc1", GET)); @@ -474,7 +474,7 @@ TEST_CASE("type", "[.cmd]"){ // REQUIRE_THROWS(multiSlsDetectorClient("vb_comp_fe", GET)); // REQUIRE_THROWS(multiSlsDetectorClient("vb_comp_adc", GET)); // REQUIRE_THROWS(multiSlsDetectorClient("vcom_cds", GET)); -// REQUIRE_THROWS(multiSlsDetectorClient("vref_restore", GET)); +// REQUIRE_THROWS(multiSlsDetectorClient("vref_rstore", GET)); // REQUIRE_THROWS(multiSlsDetectorClient("vb_opa_1st", GET)); // REQUIRE_THROWS(multiSlsDetectorClient("vref_comp_fe", GET)); // REQUIRE_THROWS(multiSlsDetectorClient("vcom_adc1", GET)); @@ -557,7 +557,7 @@ TEST_CASE("type", "[.cmd]"){ // REQUIRE_THROWS(multiSlsDetectorClient("vb_comp_fe", GET)); // REQUIRE_THROWS(multiSlsDetectorClient("vb_comp_adc", GET)); // REQUIRE_THROWS(multiSlsDetectorClient("vcom_cds", GET)); -// REQUIRE_THROWS(multiSlsDetectorClient("vref_restore", GET)); +// REQUIRE_THROWS(multiSlsDetectorClient("vref_rstore", GET)); // REQUIRE_THROWS(multiSlsDetectorClient("vb_opa_1st", GET)); // REQUIRE_THROWS(multiSlsDetectorClient("vref_comp_fe", GET)); // REQUIRE_THROWS(multiSlsDetectorClient("vcom_adc1", GET)); @@ -634,17 +634,17 @@ TEST_CASE("type", "[.cmd]"){ // std::to_string(prev_val), PUT)); // { // std::ostringstream oss; -// REQUIRE_NOTHROW(multiSlsDetectorClient("vref_restore", GET, +// REQUIRE_NOTHROW(multiSlsDetectorClient("vref_rstore", GET, // nullptr, oss)); std::string s = (oss.str()).erase (0, -// strlen("vref_restore ")); prev_val = std::stoi(s); +// strlen("vref_rstore ")); prev_val = std::stoi(s); // } // { -// REQUIRE_NOTHROW(multiSlsDetectorClient("vref_restore 1000", +// REQUIRE_NOTHROW(multiSlsDetectorClient("vref_rstore 1000", // PUT)); std::ostringstream oss; -// REQUIRE_NOTHROW(multiSlsDetectorClient("vref_restore", GET, -// nullptr, oss)); REQUIRE(oss.str() == "vref_restore 1000\n"); +// REQUIRE_NOTHROW(multiSlsDetectorClient("vref_rstore", GET, +// nullptr, oss)); REQUIRE(oss.str() == "vref_rstore 1000\n"); // } -// REQUIRE_NOTHROW(multiSlsDetectorClient("vref_restore " + +// REQUIRE_NOTHROW(multiSlsDetectorClient("vref_rstore " + // std::to_string(prev_val), PUT)); // { // std::ostringstream oss; diff --git a/slsSupportLib/include/sls_detector_defs.h b/slsSupportLib/include/sls_detector_defs.h index beaaeacf1..0b89c5273 100755 --- a/slsSupportLib/include/sls_detector_defs.h +++ b/slsSupportLib/include/sls_detector_defs.h @@ -317,7 +317,7 @@ class slsDetectorDefs { VB_COMP_FE, VB_COMP_ADC, VCOM_CDS, - VREF_RESTORE, + VREF_RSTORE, VB_OPA_1ST, VREF_COMP_FE, VCOM_ADC1, diff --git a/slsSupportLib/include/versionAPI.h b/slsSupportLib/include/versionAPI.h index ec51ae7bd..209fd59f1 100644 --- a/slsSupportLib/include/versionAPI.h +++ b/slsSupportLib/include/versionAPI.h @@ -6,7 +6,7 @@ #define APIMOENCH 0x190820 #define APICTB 0x200122 #define APIGOTTHARD 0x200122 -#define APIGOTTHARD2 0x200122 #define APIJUNGFRAU 0x200122 #define APIMYTHEN3 0x200122 #define APIEIGER 0x200122 +#define APIGOTTHARD2 0x200122