diff --git a/examples/gotthard.config b/examples/gotthard.config index f2c290df0..ed73f49e0 100755 --- a/examples/gotthard.config +++ b/examples/gotthard.config @@ -12,7 +12,7 @@ hostname bchip007 0:rx_udpip 129.129.202.98 0:rx_hostname pc6898 0:outdir /bigRAID/datadir_gotthard/rec_test_data -0:vhighvoltage 120 +0:highvoltage 120 master -1 sync none outdir /bigRAID/datadir_gotthard/rec_test_data diff --git a/examples/gotthard_two.config b/examples/gotthard_two.config index 655d4f457..9830095ca 100755 --- a/examples/gotthard_two.config +++ b/examples/gotthard_two.config @@ -6,12 +6,12 @@ hostname bchip074+bchip075+ 0:extsig:0 trigger_in_rising_edge 0:rx_tcpport 1954 0:rx_udpport 50001 -0:vhighvoltage 0 +0:highvoltage 0 1:extsig:0 trigger_in_rising_edge 1:rx_tcpport 1955 1:rx_udpport 50002 -1:vhighvoltage 0 +1:highvoltage 0 ############################################################################## ######### @@ -53,5 +53,5 @@ settings veryhighgain exptime 0.000005 period 0.0001 -vhighvoltage 90 +highvoltage 90 diff --git a/examples/jctb_moench03_T1.config b/examples/jctb_moench03_T1.config index ce99d8be7..d21dd2b26 100644 --- a/examples/jctb_moench03_T1.config +++ b/examples/jctb_moench03_T1.config @@ -498,4 +498,4 @@ rx_jsonpara detectorMode analog reg 0x5e 0x00010000 #powerchip 1 -vhighvoltage 90 +highvoltage 90 diff --git a/examples/jungfrau.config b/examples/jungfrau.config index b09fa4818..a8ae9c971 100755 --- a/examples/jungfrau.config +++ b/examples/jungfrau.config @@ -6,7 +6,7 @@ hostname localhost rx_hostname localhost #powerchip 1 -#vhighvoltage 200 +#highvoltage 200 #extsig:0 trigger_in_rising_edge #timing trigger diff --git a/examples/jungfrau_two.config b/examples/jungfrau_two.config index ea92dee1d..2198f03f6 100755 --- a/examples/jungfrau_two.config +++ b/examples/jungfrau_two.config @@ -17,7 +17,7 @@ hostname bchip048+bchip052+ rx_hostname pcmoench01 powerchip 1 -vhighvoltage 200 +highvoltage 200 #extsig:0 trigger_in_rising_edge #timing trigger diff --git a/examples/moench03_T1.config b/examples/moench03_T1.config index d062ebb58..add227a02 100644 --- a/examples/moench03_T1.config +++ b/examples/moench03_T1.config @@ -56,7 +56,7 @@ rx_discardpolicy discardpartial adcpipeline 15 powerchip 1 -vhighvoltage 90 +highvoltage 90 #adcreg 0x14 0x40 diff --git a/examples/two_gotthard.config b/examples/two_gotthard.config index 3f9763d57..c46375aa6 100755 --- a/examples/two_gotthard.config +++ b/examples/two_gotthard.config @@ -19,7 +19,7 @@ hostname bchip007+bchip009+ 0:rx_udpip 10.1.1.1 0:rx_hostname 129.129.202.134 0:outdir /data/speedt -0:vhighvoltage 120 +0:highvoltage 120 #1:hostname bchip009 @@ -37,7 +37,7 @@ hostname bchip007+bchip009+ 1:rx_udpip 10.1.2.1 1:rx_hostname 129.129.202.134 1:outdir /data/speedt -1:vhighvoltage 120 +1:highvoltage 120 master -1 diff --git a/manual/manual-client/Eiger_short.tex b/manual/manual-client/Eiger_short.tex index 00b50fcaf..f3341fc85 100755 --- a/manual/manual-client/Eiger_short.tex +++ b/manual/manual-client/Eiger_short.tex @@ -196,7 +196,7 @@ sls_detector_put 0-parameters setup.det \end{verbatim} Note that the parameter file for any realease before 4.1.1 has not the possibility to understand parameters to be set differently for different half modules, i.e. {\tt{0:txndelay\_left xxxxx},\tt{1:txndelay\_left yyyyy}}. -In the case of \E, the proper bias voltage of the sensor has to be setup, i.e. the {\tt{setup.det}} file needs to contain the line {\tt{vhighvoltage 150}}. Other detector functionality, which are rarely changed can be setup here. +In the case of \E, the proper bias voltage of the sensor has to be setup, i.e. the {\tt{setup.det}} file needs to contain the line {\tt{highvoltage 150}}. Other detector functionality, which are rarely changed can be setup here. Other important settings that are configured in the {\tt{setup.det}} file are: \begin{itemize} \item {\tt{tengiga 0/1}}, which sets whether the detector is enabled to send data through the 1~or the 10~Gb Ethernet. @@ -1156,10 +1156,10 @@ In 500k--2M pixel systems there is a hardware temperature safety switch, which w The HV can also be set and read through the software: \begin{verbatim} -./sls_detector_put vhighvoltage 150 -./sls_detector_get vhighvoltage +./sls_detector_put highvoltage 150 +./sls_detector_get highvoltage \end{verbatim} -Note that the get {\tt{vhighvoltage}} would return the measured HV from the master module only. If getting the vhighvoltage for individual halfmodules, only the master will have a value different from -999. +Note that the get {\tt{highvoltage}} would return the measured HV from the master module only. If getting the highvoltage for individual halfmodules, only the master will have a value different from -999. \appendix @@ -1411,7 +1411,7 @@ Environment variable SLSDETNAME can be set for using 2 different detectors from \subsection{Measure the HV} For every system: \begin{itemize} -\item Software-wise measure it (now the software returns the measured value), with {\tt{sls\_detector\_get vhighvoltage}}. The returned value is the HV (for proper Eiger setting is approximately 150~V) if it is correctly set. If two master modules are presents (multi systems), the average is returned (still to be tested). If one asks for the individual $n$ half module bias voltage through {\tt{sls\_detector\_get n:vhighvoltage}}, if the $n$ module is a master, the actual voltage will be returned. If it is a slave, -999 will be returned. +\item Software-wise measure it (now the software returns the measured value), with {\tt{sls\_detector\_get highvoltage}}. The returned value is the HV (for proper Eiger setting is approximately 150~V) if it is correctly set. If two master modules are presents (multi systems), the average is returned (still to be tested). If one asks for the individual $n$ half module bias voltage through {\tt{sls\_detector\_get n:highvoltage}}, if the $n$ module is a master, the actual voltage will be returned. If it is a slave, -999 will be returned. \item Hardware-wise (opening the detector) measure value of HV on C14 on the power distribution board. Check also that the small HV connector cable is really connected. \end{itemize} @@ -1462,7 +1462,7 @@ Scroll up in the terminal till you find:\\ There is also an easier way, that is that only the master module will return the real value of the HV. If you have more than 1 detector system, then you will have more than 1 physical master, as the HV needs to be applied to all the systems. \begin{verbatim} -for i in $(seq 0 36); do sls_detector_put $i:vhighvoltage; done +for i in $(seq 0 36); do sls_detector_put $i:highvoltage; done \end{verbatim} Only the master will return to you a sensible number (150 normally). the others will return -999. @@ -1623,10 +1623,10 @@ ratecorr number where {\tt{number}} is a string that should be interpreted as a float in s. 0.000000 means correction off. Values above zero are the value of $\tau$ in ns. \item \begin{verbatim} -sls_detector_get vhighvoltage -vhighvoltage number +sls_detector_get highvoltage +highvoltage number \end{verbatim} -where {\tt{number}} is a string that should be interpreted as an int and for proper Eiger setting is approximately 150~V if it is correctly set. If two master modules are presents (multi systems), the average is returned (still to be tested). If one asks for the individual $n$ half module bias voltage through {\tt{sls\_detector\_get n:vhighvoltage}}, if the $n$ module is a master, the actual voltage will be returned. If it is a slave, -999 will be returned. +where {\tt{number}} is a string that should be interpreted as an int and for proper Eiger setting is approximately 150~V if it is correctly set. If two master modules are presents (multi systems), the average is returned (still to be tested). If one asks for the individual $n$ half module bias voltage through {\tt{sls\_detector\_get n:highvoltage}}, if the $n$ module is a master, the actual voltage will be returned. If it is a slave, -999 will be returned. \item \begin{verbatim} sls_detector_get busy diff --git a/manual/manual-client/commands.txt b/manual/manual-client/commands.txt index bde305796..ce54d5906 100755 --- a/manual/manual-client/commands.txt +++ b/manual/manual-client/commands.txt @@ -142,7 +142,7 @@ "vpreamp"; // sets/get vpreamp value (advanced! Mythen) "vshaper1"; // sets/get vshaper1 value (advanced! Mythen) "vshaper2"; // sets/get vshaper2 value (advanced! Mythen) - "vhighvoltage"; // sets/get vhighvoltage value (advanced! Chiptest board and Eiger) + "highvoltage"; // sets/get highvoltage value (advanced! Chiptest board and Eiger) "vapower"; // sets/get vapower value (advanced! Chiptest board) "vddpower"; // sets/get vddpower value (advanced! Chiptest board) "vshpower"; // sets/get vshpower value (advanced! Chiptest board) diff --git a/manual/manual-client/slsDetectorClientHowTo.tex b/manual/manual-client/slsDetectorClientHowTo.tex index 0f9ed3190..d21f2f2dd 100755 --- a/manual/manual-client/slsDetectorClientHowTo.tex +++ b/manual/manual-client/slsDetectorClientHowTo.tex @@ -335,7 +335,7 @@ Advanced settings changing the analog or digital performance of the acquisition. \item[vpreamp n] Sets the DAC value of the preamp feedback to n. \item[vshaper1 n] Sets the DAC value of the shaper1 feedback to n. \item[vshaper2 n] Sets the DAC value of the shaper2 feedback to n. -\item[vhighvoltage n] Sets the DAC value of the high voltage to n (in V). +\item[highvoltage n] Sets the DAC value of the high voltage to n (in V). \item[vapower n] CHIPTEST BOARD ONLY - Sets the DAC value of the analog voltage to n. \item[vddpower n] CHIPTEST BOARD ONLY - Sets the DAC value of the analog voltage to n. \item[vshpower n] CHIPTEST BOARD ONLY - Sets the comparator power supply in dac units (0-1024). @@ -648,7 +648,7 @@ Advanced settings changing the analog or digital performance of the acquisition. \item[vpreamp] Returns the DAC value of the preamp feedback to n. \item[vshaper1] Returns the DAC value of the shaper1 feedback to n. \item[vshaper2] Returns the DAC value of the shaper2 feedback to n. -\item[vhighvoltage] Returns the DAC value of the high voltage to n. +\item[highvoltage] Returns the DAC value of the high voltage to n. \item[vapower] CHIPTEST BOARD ONLY - Returns the DAC value of the analog voltage to n. \item[vddpower] CHIPTEST BOARD ONLY - Returns the DAC value of the analog voltage to n. \item[vshpower] CHIPTEST BOARD ONLY - Returns the comparator power supply in dac units (0-1024). @@ -714,7 +714,7 @@ One can configure all the detector settings in a parameter file {\tt{setup.det}} sls_detector_put parameters setup.det \end{verbatim} -In the case of \E, the parameter file ({\tt{setup.det}} needs to setup the proper bias voltage of the sensor, i.e. needs to contain the line {\tt{vhighvoltage 150}}. +In the case of \E, the parameter file ({\tt{setup.det}} needs to setup the proper bias voltage of the sensor, i.e. needs to contain the line {\tt{highvoltage 150}}. \subsection{Standard acquisition} diff --git a/manual/manual-main/slsDetectorClientHowTo.tex b/manual/manual-main/slsDetectorClientHowTo.tex index 6f411c84a..e97bea1eb 100755 --- a/manual/manual-main/slsDetectorClientHowTo.tex +++ b/manual/manual-main/slsDetectorClientHowTo.tex @@ -322,7 +322,7 @@ Advanced settings changing the analog or digital performance of the acquisition. \item[vpreamp n] Sets the DAC value of the preamp feedback to n. \item[vshaper1 n] Sets the DAC value of the shaper1 feedback to n. \item[vshaper2 n] Sets the DAC value of the shaper2 feedback to n. -\item[vhighvoltage n] CHIPTEST BOARD ONLY - Sets the DAC value of the high voltage to n. +\item[highvoltage n] CHIPTEST BOARD ONLY - Sets the DAC value of the high voltage to n. \item[vapower n] CHIPTEST BOARD ONLY - Sets the DAC value of the analog voltage to n. \item[vddpower n] CHIPTEST BOARD ONLY - Sets the DAC value of the analog voltage to n. \item[vshpower n] CHIPTEST BOARD ONLY - Sets the comparator power supply in dac units (0-1024). @@ -594,7 +594,7 @@ Advanced settings changing the analog or digital performance of the acquisition. \item[vpreamp] Returns the DAC value of the preamp feedback to n. \item[vshaper1] Returns the DAC value of the shaper1 feedback to n. \item[vshaper2] Returns the DAC value of the shaper2 feedback to n. -\item[vhighvoltage] CHIPTEST BOARD ONLY - Returns the DAC value of the high voltage to n. +\item[highvoltage] CHIPTEST BOARD ONLY - Returns the DAC value of the high voltage to n. \item[vapower] CHIPTEST BOARD ONLY - Returns the DAC value of the analog voltage to n. \item[vddpower] CHIPTEST BOARD ONLY - Returns the DAC value of the analog voltage to n. \item[vshpower] CHIPTEST BOARD ONLY - Returns the comparator power supply in dac units (0-1024). diff --git a/slsDetectorGui/forms/form_tab_developer.ui b/slsDetectorGui/forms/form_tab_developer.ui index d93fd43c6..8cf71fea6 100755 --- a/slsDetectorGui/forms/form_tab_developer.ui +++ b/slsDetectorGui/forms/form_tab_developer.ui @@ -86,7 +86,7 @@ - <html><head/><body><p>High Voltage</p><p> #vhighvoltage#</p></body></html> + <html><head/><body><p>High Voltage</p><p> #highvoltage#</p></body></html> High Voltage: @@ -108,7 +108,7 @@ - <html><head/><body><p>High Voltage</p><p> #vhighvoltage#</p></body></html> + <html><head/><body><p>High Voltage</p><p> #highvoltage#</p></body></html> @@ -156,7 +156,7 @@ - <html><head/><body><p>High Voltage. Range: 60 - 200V. Swich off high voltage by setting to 0.</p><p>-1 corresponds to different values from detectors.</p><p>#vhighvoltage#</p></body></html> + <html><head/><body><p>High Voltage. Range: 60 - 200V. Swich off high voltage by setting to 0.</p><p>-1 corresponds to different values from detectors.</p><p>#highvoltage#</p></body></html> High Voltage: @@ -178,7 +178,7 @@ - <html><head/><body><p>High Voltage. Range: 60 - 200V. Swich off high voltage by setting to 0.</p><p>-1 corresponds to different values from detectors.</p><p>#vhighvoltage#</p></body></html> + <html><head/><body><p>High Voltage. Range: 60 - 200V. Swich off high voltage by setting to 0.</p><p>-1 corresponds to different values from detectors.</p><p>#highvoltage#</p></body></html> -1 diff --git a/slsDetectorSoftware/src/CmdProxy.h b/slsDetectorSoftware/src/CmdProxy.h index f3e85893c..28c7cbe58 100644 --- a/slsDetectorSoftware/src/CmdProxy.h +++ b/slsDetectorSoftware/src/CmdProxy.h @@ -528,6 +528,7 @@ class CmdProxy { {"cycles", "triggers"}, {"cyclesl", "triggersl"}, {"clkdivider", "speed"}, + {"vhighvoltage", "highvoltage"}, {"digitest", "imagetest"}, /** temperature */ @@ -654,7 +655,7 @@ class CmdProxy { {"clkphase", &CmdProxy::ClockPhase}, {"maxclkphaseshift", &CmdProxy::MaxClockPhaseShift}, {"clkdiv", &CmdProxy::ClockDivider}, - {"vhighvoltage", &CmdProxy::vhighvoltage}, + {"highvoltage", &CmdProxy::highvoltage}, {"powerchip", &CmdProxy::powerchip}, {"imagetest", &CmdProxy::imagetest}, {"extsig", &CmdProxy::ExternalSignal}, @@ -1185,7 +1186,7 @@ class CmdProxy { "\n\t[CTB][Jungfrau] Absolute maximum Phase shift of of the " "clock to latch digital bits."); - INTEGER_COMMAND(vhighvoltage, getHighVoltage, setHighVoltage, StringTo, + INTEGER_COMMAND(highvoltage, getHighVoltage, setHighVoltage, StringTo, "[n_value]\n\tHigh voltage to the sensor in Voltage." "\n\t[Gotthard] [0|90|110|120|150|180|200]" "\n\t[Eiger][Mythen3][Gotthard2] 0-200" diff --git a/slsDetectorSoftware/tests/test-CmdProxy.cpp b/slsDetectorSoftware/tests/test-CmdProxy.cpp index 66c8af0a2..401d266e7 100644 --- a/slsDetectorSoftware/tests/test-CmdProxy.cpp +++ b/slsDetectorSoftware/tests/test-CmdProxy.cpp @@ -793,97 +793,97 @@ TEST_CASE("maxclkphaseshift", "[.cmd][.new]") { } } -TEST_CASE("vhighvoltage", "[.cmd][.new]") { +TEST_CASE("highvoltage", "[.cmd][.new]") { Detector det; CmdProxy proxy(&det); auto det_type = det.getDetectorType().squash(); auto prev_val = det.getHighVoltage(); // selected values if (det_type == defs::GOTTHARD) { - REQUIRE_THROWS(proxy.Call("vhighvoltage", {"50"}, -1, PUT)); + REQUIRE_THROWS(proxy.Call("highvoltage", {"50"}, -1, PUT)); { std::ostringstream oss1, oss2; - proxy.Call("vhighvoltage", {"90"}, -1, PUT, oss1); - REQUIRE(oss1.str() == "vhighvoltage 90\n"); - proxy.Call("vhighvoltage", {}, -1, GET, oss2); - REQUIRE(oss2.str() == "vhighvoltage 90\n"); + proxy.Call("highvoltage", {"90"}, -1, PUT, oss1); + REQUIRE(oss1.str() == "highvoltage 90\n"); + proxy.Call("highvoltage", {}, -1, GET, oss2); + REQUIRE(oss2.str() == "highvoltage 90\n"); } { std::ostringstream oss1, oss2; - proxy.Call("vhighvoltage", {"0"}, -1, PUT, oss1); - REQUIRE(oss1.str() == "vhighvoltage 0\n"); - proxy.Call("vhighvoltage", {}, -1, GET, oss2); - REQUIRE(oss2.str() == "vhighvoltage 0\n"); + proxy.Call("highvoltage", {"0"}, -1, PUT, oss1); + REQUIRE(oss1.str() == "highvoltage 0\n"); + proxy.Call("highvoltage", {}, -1, GET, oss2); + REQUIRE(oss2.str() == "highvoltage 0\n"); } } // range 0, 60 - 200 else if (det_type == defs::JUNGFRAU || det_type == defs::CHIPTESTBOARD || det_type == defs::MOENCH) { - REQUIRE_THROWS(proxy.Call("vhighvoltage", {"50"}, -1, PUT)); + REQUIRE_THROWS(proxy.Call("highvoltage", {"50"}, -1, PUT)); { std::ostringstream oss1, oss2; - proxy.Call("vhighvoltage", {"90"}, -1, PUT, oss1); - REQUIRE(oss1.str() == "vhighvoltage 90\n"); - proxy.Call("vhighvoltage", {}, -1, GET, oss2); - REQUIRE(oss2.str() == "vhighvoltage 90\n"); + proxy.Call("highvoltage", {"90"}, -1, PUT, oss1); + REQUIRE(oss1.str() == "highvoltage 90\n"); + proxy.Call("highvoltage", {}, -1, GET, oss2); + REQUIRE(oss2.str() == "highvoltage 90\n"); } { std::ostringstream oss1, oss2; - proxy.Call("vhighvoltage", {"0"}, -1, PUT, oss1); - REQUIRE(oss1.str() == "vhighvoltage 0\n"); - proxy.Call("vhighvoltage", {}, -1, GET, oss2); - REQUIRE(oss2.str() == "vhighvoltage 0\n"); + proxy.Call("highvoltage", {"0"}, -1, PUT, oss1); + REQUIRE(oss1.str() == "highvoltage 0\n"); + proxy.Call("highvoltage", {}, -1, GET, oss2); + REQUIRE(oss2.str() == "highvoltage 0\n"); } } // full range 0 - 200 (get needs to wait) else if (det_type == defs::EIGER) { { std::ostringstream oss1, oss2; - proxy.Call("vhighvoltage", {"50"}, 0, PUT, oss1); - REQUIRE(oss1.str() == "vhighvoltage 50\n"); + proxy.Call("highvoltage", {"50"}, 0, PUT, oss1); + REQUIRE(oss1.str() == "highvoltage 50\n"); std::this_thread::sleep_for(std::chrono::seconds(2)); - proxy.Call("vhighvoltage", {}, 0, GET, oss2); - REQUIRE(oss2.str() == "vhighvoltage 50\n"); + proxy.Call("highvoltage", {}, 0, GET, oss2); + REQUIRE(oss2.str() == "highvoltage 50\n"); } { std::ostringstream oss1, oss2; - proxy.Call("vhighvoltage", {"120"}, 0, PUT, oss1); - REQUIRE(oss1.str() == "vhighvoltage 120\n"); + proxy.Call("highvoltage", {"120"}, 0, PUT, oss1); + REQUIRE(oss1.str() == "highvoltage 120\n"); std::this_thread::sleep_for(std::chrono::seconds(2)); - proxy.Call("vhighvoltage", {}, 0, GET, oss2); - REQUIRE(oss2.str() == "vhighvoltage 120\n"); + proxy.Call("highvoltage", {}, 0, GET, oss2); + REQUIRE(oss2.str() == "highvoltage 120\n"); } { std::ostringstream oss1, oss2; - proxy.Call("vhighvoltage", {"0"}, 0, PUT, oss1); - REQUIRE(oss1.str() == "vhighvoltage 0\n"); + proxy.Call("highvoltage", {"0"}, 0, PUT, oss1); + REQUIRE(oss1.str() == "highvoltage 0\n"); std::this_thread::sleep_for(std::chrono::seconds(2)); - proxy.Call("vhighvoltage", {}, 0, GET, oss2); - REQUIRE(oss2.str() == "vhighvoltage 0\n"); + proxy.Call("highvoltage", {}, 0, GET, oss2); + REQUIRE(oss2.str() == "highvoltage 0\n"); } } // full range 0 - 200 else { { std::ostringstream oss1, oss2; - proxy.Call("vhighvoltage", {"50"}, -1, PUT, oss1); - REQUIRE(oss1.str() == "vhighvoltage 50\n"); - proxy.Call("vhighvoltage", {}, -1, GET, oss2); - REQUIRE(oss2.str() == "vhighvoltage 50\n"); + proxy.Call("highvoltage", {"50"}, -1, PUT, oss1); + REQUIRE(oss1.str() == "highvoltage 50\n"); + proxy.Call("highvoltage", {}, -1, GET, oss2); + REQUIRE(oss2.str() == "highvoltage 50\n"); } { std::ostringstream oss1, oss2; - proxy.Call("vhighvoltage", {"120"}, -1, PUT, oss1); - REQUIRE(oss1.str() == "vhighvoltage 120\n"); - proxy.Call("vhighvoltage", {}, -1, GET, oss2); - REQUIRE(oss2.str() == "vhighvoltage 120\n"); + proxy.Call("highvoltage", {"120"}, -1, PUT, oss1); + REQUIRE(oss1.str() == "highvoltage 120\n"); + proxy.Call("highvoltage", {}, -1, GET, oss2); + REQUIRE(oss2.str() == "highvoltage 120\n"); } { std::ostringstream oss1, oss2; - proxy.Call("vhighvoltage", {"0"}, -1, PUT, oss1); - REQUIRE(oss1.str() == "vhighvoltage 0\n"); - proxy.Call("vhighvoltage", {}, -1, GET, oss2); - REQUIRE(oss2.str() == "vhighvoltage 0\n"); + proxy.Call("highvoltage", {"0"}, -1, PUT, oss1); + REQUIRE(oss1.str() == "highvoltage 0\n"); + proxy.Call("highvoltage", {}, -1, GET, oss2); + REQUIRE(oss2.str() == "highvoltage 0\n"); } } for (int i = 0; i != det.size(); ++i) { diff --git a/slsSupportLib/src/ToString.cpp b/slsSupportLib/src/ToString.cpp index 3397aee0c..18a55af0d 100644 --- a/slsSupportLib/src/ToString.cpp +++ b/slsSupportLib/src/ToString.cpp @@ -492,7 +492,7 @@ std::string ToString(const defs::dacIndex s) { case defs::TRIMBIT_SCAN: return std::string("trimbit_scan"); case defs::HIGH_VOLTAGE: - return std::string("vhighvoltage"); + return std::string("highvoltage"); case defs::IO_DELAY: return std::string("iodelay"); default: @@ -850,7 +850,7 @@ template <> defs::dacIndex StringTo(const std::string &s) { return defs::IBIAS_SFP; if (s == "trimbit_scan") return defs::TRIMBIT_SCAN; - if (s == "vhighvoltage") + if (s == "highvoltage") return defs::HIGH_VOLTAGE; if (s == "iodelay") return defs::IO_DELAY;