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

changing command from vhighvoltage to highvoltage

Browse Source
This commit is contained in:
maliakal_d
2020-07-30 11:50:03 +02:00
parent 7899c5faef
commit 7dfeb987db
15 changed files with 77 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/gotthard.config
View File

@ -12,7 +12,7 @@ hostname bchip007
0:rx_udpip 129.129.202.98 0:rx_udpip 129.129.202.98
0:rx_hostname pc6898 0:rx_hostname pc6898
0:outdir /bigRAID/datadir_gotthard/rec_test_data 0:outdir /bigRAID/datadir_gotthard/rec_test_data
0:vhighvoltage 120 0:highvoltage 120
master -1 master -1
sync none sync none
outdir /bigRAID/datadir_gotthard/rec_test_data outdir /bigRAID/datadir_gotthard/rec_test_data

6
examples/gotthard_two.config
View File

@ -6,12 +6,12 @@ hostname bchip074+bchip075+
0:extsig:0 trigger_in_rising_edge 0:extsig:0 trigger_in_rising_edge
0:rx_tcpport 1954 0:rx_tcpport 1954
0:rx_udpport 50001 0:rx_udpport 50001
0:vhighvoltage 0 0:highvoltage 0
1:extsig:0 trigger_in_rising_edge 1:extsig:0 trigger_in_rising_edge
1:rx_tcpport 1955 1:rx_tcpport 1955
1:rx_udpport 50002 1:rx_udpport 50002
1:vhighvoltage 0 1:highvoltage 0
############################################################################## ##############################################################################
######### #########
@ -53,5 +53,5 @@ settings veryhighgain
exptime 0.000005 exptime 0.000005
period 0.0001 period 0.0001
vhighvoltage 90 highvoltage 90

2
examples/jctb_moench03_T1.config
View File

@ -498,4 +498,4 @@ rx_jsonpara detectorMode analog
reg 0x5e 0x00010000 reg 0x5e 0x00010000
#powerchip 1 #powerchip 1
vhighvoltage 90 highvoltage 90

2
examples/jungfrau.config
View File

@ -6,7 +6,7 @@ hostname localhost
rx_hostname localhost rx_hostname localhost
#powerchip 1 #powerchip 1
#vhighvoltage 200 #highvoltage 200
#extsig:0 trigger_in_rising_edge #extsig:0 trigger_in_rising_edge
#timing trigger #timing trigger

2
examples/jungfrau_two.config
View File

@ -17,7 +17,7 @@ hostname bchip048+bchip052+
rx_hostname pcmoench01 rx_hostname pcmoench01
powerchip 1 powerchip 1
vhighvoltage 200 highvoltage 200
#extsig:0 trigger_in_rising_edge #extsig:0 trigger_in_rising_edge
#timing trigger #timing trigger

2
examples/moench03_T1.config
View File

@ -56,7 +56,7 @@ rx_discardpolicy discardpartial
adcpipeline 15 adcpipeline 15
powerchip 1 powerchip 1
vhighvoltage 90 highvoltage 90
#adcreg 0x14 0x40 #adcreg 0x14 0x40

4
examples/two_gotthard.config
View File

@ -19,7 +19,7 @@ hostname bchip007+bchip009+
0:rx_udpip 10.1.1.1 0:rx_udpip 10.1.1.1
0:rx_hostname 129.129.202.134 0:rx_hostname 129.129.202.134
0:outdir /data/speedt 0:outdir /data/speedt
0:vhighvoltage 120 0:highvoltage 120
#1:hostname bchip009 #1:hostname bchip009
@ -37,7 +37,7 @@ hostname bchip007+bchip009+
1:rx_udpip 10.1.2.1 1:rx_udpip 10.1.2.1
1:rx_hostname 129.129.202.134 1:rx_hostname 129.129.202.134
1:outdir /data/speedt 1:outdir /data/speedt
1:vhighvoltage 120 1:highvoltage 120
master -1 master -1

18
manual/manual-client/Eiger_short.tex
View File

@ -196,7 +196,7 @@ sls_detector_put 0-parameters setup.det
\end{verbatim} \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}}. 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: Other important settings that are configured in the {\tt{setup.det}} file are:
\begin{itemize} \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. \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: The HV can also be set and read through the software:
\begin{verbatim} \begin{verbatim}
./sls_detector_put vhighvoltage 150 ./sls_detector_put highvoltage 150
./sls_detector_get vhighvoltage ./sls_detector_get highvoltage
\end{verbatim} \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 \appendix
@ -1411,7 +1411,7 @@ Environment variable SLSDETNAME can be set for using 2 different detectors from
\subsection{Measure the HV} \subsection{Measure the HV}
For every system: For every system:
\begin{itemize} \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. \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} \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. 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} \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} \end{verbatim}
Only the master will return to you a sensible number (150 normally). the others will return -999. 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. 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} \item \begin{verbatim}
sls_detector_get vhighvoltage sls_detector_get highvoltage
vhighvoltage number highvoltage number
\end{verbatim} \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} \item \begin{verbatim}
sls_detector_get busy sls_detector_get busy

2
manual/manual-client/commands.txt
View File

@ -142,7 +142,7 @@
"vpreamp"; // sets/get vpreamp value (advanced! Mythen) "vpreamp"; // sets/get vpreamp value (advanced! Mythen)
"vshaper1"; // sets/get vshaper1 value (advanced! Mythen) "vshaper1"; // sets/get vshaper1 value (advanced! Mythen)
"vshaper2"; // sets/get vshaper2 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) "vapower"; // sets/get vapower value (advanced! Chiptest board)
"vddpower"; // sets/get vddpower value (advanced! Chiptest board) "vddpower"; // sets/get vddpower value (advanced! Chiptest board)
"vshpower"; // sets/get vshpower value (advanced! Chiptest board) "vshpower"; // sets/get vshpower value (advanced! Chiptest board)

6
manual/manual-client/slsDetectorClientHowTo.tex
View File

@ -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[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[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[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[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[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). \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[vpreamp] Returns the DAC value of the preamp feedback to n.
\item[vshaper1] Returns the DAC value of the shaper1 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[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[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[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). \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 sls_detector_put parameters setup.det
\end{verbatim} \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} \subsection{Standard acquisition}

4
manual/manual-main/slsDetectorClientHowTo.tex
View File

@ -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[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[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[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[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[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). \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[vpreamp] Returns the DAC value of the preamp feedback to n.
\item[vshaper1] Returns the DAC value of the shaper1 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[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[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[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). \item[vshpower] CHIPTEST BOARD ONLY - Returns the comparator power supply in dac units (0-1024).

8
slsDetectorGui/forms/form_tab_developer.ui
View File

@ -86,7 +86,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;High Voltage&lt;/p&gt;&lt;p&gt; #vhighvoltage#&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;High Voltage&lt;/p&gt;&lt;p&gt; #highvoltage#&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="text"> <property name="text">
<string>High Voltage: </string> <string>High Voltage: </string>
@ -108,7 +108,7 @@
</size> </size>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;High Voltage&lt;/p&gt;&lt;p&gt; #vhighvoltage#&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;High Voltage&lt;/p&gt;&lt;p&gt; #highvoltage#&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<item> <item>
<property name="text"> <property name="text">
@ -156,7 +156,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;High Voltage. Range: 60 - 200V. Swich off high voltage by setting to 0.&lt;/p&gt;&lt;p&gt;-1 corresponds to different values from detectors.&lt;/p&gt;&lt;p&gt;#vhighvoltage#&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;High Voltage. Range: 60 - 200V. Swich off high voltage by setting to 0.&lt;/p&gt;&lt;p&gt;-1 corresponds to different values from detectors.&lt;/p&gt;&lt;p&gt;#highvoltage#&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="text"> <property name="text">
<string>High Voltage: </string> <string>High Voltage: </string>
@ -178,7 +178,7 @@
</size> </size>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;High Voltage. Range: 60 - 200V. Swich off high voltage by setting to 0.&lt;/p&gt;&lt;p&gt;-1 corresponds to different values from detectors.&lt;/p&gt;&lt;p&gt;#vhighvoltage#&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;High Voltage. Range: 60 - 200V. Swich off high voltage by setting to 0.&lt;/p&gt;&lt;p&gt;-1 corresponds to different values from detectors.&lt;/p&gt;&lt;p&gt;#highvoltage#&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="minimum"> <property name="minimum">
<number>-1</number> <number>-1</number>

5
slsDetectorSoftware/src/CmdProxy.h
View File

@ -528,6 +528,7 @@ class CmdProxy {
{"cycles", "triggers"}, {"cycles", "triggers"},
{"cyclesl", "triggersl"}, {"cyclesl", "triggersl"},
{"clkdivider", "speed"}, {"clkdivider", "speed"},
{"vhighvoltage", "highvoltage"},
{"digitest", "imagetest"}, {"digitest", "imagetest"},
/** temperature */ /** temperature */
@ -654,7 +655,7 @@ class CmdProxy {
{"clkphase", &CmdProxy::ClockPhase}, {"clkphase", &CmdProxy::ClockPhase},
{"maxclkphaseshift", &CmdProxy::MaxClockPhaseShift}, {"maxclkphaseshift", &CmdProxy::MaxClockPhaseShift},
{"clkdiv", &CmdProxy::ClockDivider}, {"clkdiv", &CmdProxy::ClockDivider},
{"vhighvoltage", &CmdProxy::vhighvoltage}, {"highvoltage", &CmdProxy::highvoltage},
{"powerchip", &CmdProxy::powerchip}, {"powerchip", &CmdProxy::powerchip},
{"imagetest", &CmdProxy::imagetest}, {"imagetest", &CmdProxy::imagetest},
{"extsig", &CmdProxy::ExternalSignal}, {"extsig", &CmdProxy::ExternalSignal},
@ -1185,7 +1186,7 @@ class CmdProxy {
"\n\t[CTB][Jungfrau] Absolute maximum Phase shift of of the " "\n\t[CTB][Jungfrau] Absolute maximum Phase shift of of the "
"clock to latch digital bits."); "clock to latch digital bits.");
INTEGER_COMMAND(vhighvoltage, getHighVoltage, setHighVoltage, StringTo<int>, INTEGER_COMMAND(highvoltage, getHighVoltage, setHighVoltage, StringTo<int>,
"[n_value]\n\tHigh voltage to the sensor in Voltage." "[n_value]\n\tHigh voltage to the sensor in Voltage."
"\n\t[Gotthard] [0|90|110|120|150|180|200]" "\n\t[Gotthard] [0|90|110|120|150|180|200]"
"\n\t[Eiger][Mythen3][Gotthard2] 0-200" "\n\t[Eiger][Mythen3][Gotthard2] 0-200"

86
slsDetectorSoftware/tests/test-CmdProxy.cpp
View File

@ -793,97 +793,97 @@ TEST_CASE("maxclkphaseshift", "[.cmd][.new]") {
} }
} }
TEST_CASE("vhighvoltage", "[.cmd][.new]") { TEST_CASE("highvoltage", "[.cmd][.new]") {
Detector det; Detector det;
CmdProxy proxy(&det); CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash(); auto det_type = det.getDetectorType().squash();
auto prev_val = det.getHighVoltage(); auto prev_val = det.getHighVoltage();
// selected values // selected values
if (det_type == defs::GOTTHARD) { 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; std::ostringstream oss1, oss2;
proxy.Call("vhighvoltage", {"90"}, -1, PUT, oss1); proxy.Call("highvoltage", {"90"}, -1, PUT, oss1);
REQUIRE(oss1.str() == "vhighvoltage 90\n"); REQUIRE(oss1.str() == "highvoltage 90\n");
proxy.Call("vhighvoltage", {}, -1, GET, oss2); proxy.Call("highvoltage", {}, -1, GET, oss2);
REQUIRE(oss2.str() == "vhighvoltage 90\n"); REQUIRE(oss2.str() == "highvoltage 90\n");
} }
{ {
std::ostringstream oss1, oss2; std::ostringstream oss1, oss2;
proxy.Call("vhighvoltage", {"0"}, -1, PUT, oss1); proxy.Call("highvoltage", {"0"}, -1, PUT, oss1);
REQUIRE(oss1.str() == "vhighvoltage 0\n"); REQUIRE(oss1.str() == "highvoltage 0\n");
proxy.Call("vhighvoltage", {}, -1, GET, oss2); proxy.Call("highvoltage", {}, -1, GET, oss2);
REQUIRE(oss2.str() == "vhighvoltage 0\n"); REQUIRE(oss2.str() == "highvoltage 0\n");
} }
} }
// range 0, 60 - 200 // range 0, 60 - 200
else if (det_type == defs::JUNGFRAU || det_type == defs::CHIPTESTBOARD || else if (det_type == defs::JUNGFRAU || det_type == defs::CHIPTESTBOARD ||
det_type == defs::MOENCH) { det_type == defs::MOENCH) {
REQUIRE_THROWS(proxy.Call("vhighvoltage", {"50"}, -1, PUT)); REQUIRE_THROWS(proxy.Call("highvoltage", {"50"}, -1, PUT));
{ {
std::ostringstream oss1, oss2; std::ostringstream oss1, oss2;
proxy.Call("vhighvoltage", {"90"}, -1, PUT, oss1); proxy.Call("highvoltage", {"90"}, -1, PUT, oss1);
REQUIRE(oss1.str() == "vhighvoltage 90\n"); REQUIRE(oss1.str() == "highvoltage 90\n");
proxy.Call("vhighvoltage", {}, -1, GET, oss2); proxy.Call("highvoltage", {}, -1, GET, oss2);
REQUIRE(oss2.str() == "vhighvoltage 90\n"); REQUIRE(oss2.str() == "highvoltage 90\n");
} }
{ {
std::ostringstream oss1, oss2; std::ostringstream oss1, oss2;
proxy.Call("vhighvoltage", {"0"}, -1, PUT, oss1); proxy.Call("highvoltage", {"0"}, -1, PUT, oss1);
REQUIRE(oss1.str() == "vhighvoltage 0\n"); REQUIRE(oss1.str() == "highvoltage 0\n");
proxy.Call("vhighvoltage", {}, -1, GET, oss2); proxy.Call("highvoltage", {}, -1, GET, oss2);
REQUIRE(oss2.str() == "vhighvoltage 0\n"); REQUIRE(oss2.str() == "highvoltage 0\n");
} }
} }
// full range 0 - 200 (get needs to wait) // full range 0 - 200 (get needs to wait)
else if (det_type == defs::EIGER) { else if (det_type == defs::EIGER) {
{ {
std::ostringstream oss1, oss2; std::ostringstream oss1, oss2;
proxy.Call("vhighvoltage", {"50"}, 0, PUT, oss1); proxy.Call("highvoltage", {"50"}, 0, PUT, oss1);
REQUIRE(oss1.str() == "vhighvoltage 50\n"); REQUIRE(oss1.str() == "highvoltage 50\n");
std::this_thread::sleep_for(std::chrono::seconds(2)); std::this_thread::sleep_for(std::chrono::seconds(2));
proxy.Call("vhighvoltage", {}, 0, GET, oss2); proxy.Call("highvoltage", {}, 0, GET, oss2);
REQUIRE(oss2.str() == "vhighvoltage 50\n"); REQUIRE(oss2.str() == "highvoltage 50\n");
} }
{ {
std::ostringstream oss1, oss2; std::ostringstream oss1, oss2;
proxy.Call("vhighvoltage", {"120"}, 0, PUT, oss1); proxy.Call("highvoltage", {"120"}, 0, PUT, oss1);
REQUIRE(oss1.str() == "vhighvoltage 120\n"); REQUIRE(oss1.str() == "highvoltage 120\n");
std::this_thread::sleep_for(std::chrono::seconds(2)); std::this_thread::sleep_for(std::chrono::seconds(2));
proxy.Call("vhighvoltage", {}, 0, GET, oss2); proxy.Call("highvoltage", {}, 0, GET, oss2);
REQUIRE(oss2.str() == "vhighvoltage 120\n"); REQUIRE(oss2.str() == "highvoltage 120\n");
} }
{ {
std::ostringstream oss1, oss2; std::ostringstream oss1, oss2;
proxy.Call("vhighvoltage", {"0"}, 0, PUT, oss1); proxy.Call("highvoltage", {"0"}, 0, PUT, oss1);
REQUIRE(oss1.str() == "vhighvoltage 0\n"); REQUIRE(oss1.str() == "highvoltage 0\n");
std::this_thread::sleep_for(std::chrono::seconds(2)); std::this_thread::sleep_for(std::chrono::seconds(2));
proxy.Call("vhighvoltage", {}, 0, GET, oss2); proxy.Call("highvoltage", {}, 0, GET, oss2);
REQUIRE(oss2.str() == "vhighvoltage 0\n"); REQUIRE(oss2.str() == "highvoltage 0\n");
} }
} }
// full range 0 - 200 // full range 0 - 200
else { else {
{ {
std::ostringstream oss1, oss2; std::ostringstream oss1, oss2;
proxy.Call("vhighvoltage", {"50"}, -1, PUT, oss1); proxy.Call("highvoltage", {"50"}, -1, PUT, oss1);
REQUIRE(oss1.str() == "vhighvoltage 50\n"); REQUIRE(oss1.str() == "highvoltage 50\n");
proxy.Call("vhighvoltage", {}, -1, GET, oss2); proxy.Call("highvoltage", {}, -1, GET, oss2);
REQUIRE(oss2.str() == "vhighvoltage 50\n"); REQUIRE(oss2.str() == "highvoltage 50\n");
} }
{ {
std::ostringstream oss1, oss2; std::ostringstream oss1, oss2;
proxy.Call("vhighvoltage", {"120"}, -1, PUT, oss1); proxy.Call("highvoltage", {"120"}, -1, PUT, oss1);
REQUIRE(oss1.str() == "vhighvoltage 120\n"); REQUIRE(oss1.str() == "highvoltage 120\n");
proxy.Call("vhighvoltage", {}, -1, GET, oss2); proxy.Call("highvoltage", {}, -1, GET, oss2);
REQUIRE(oss2.str() == "vhighvoltage 120\n"); REQUIRE(oss2.str() == "highvoltage 120\n");
} }
{ {
std::ostringstream oss1, oss2; std::ostringstream oss1, oss2;
proxy.Call("vhighvoltage", {"0"}, -1, PUT, oss1); proxy.Call("highvoltage", {"0"}, -1, PUT, oss1);
REQUIRE(oss1.str() == "vhighvoltage 0\n"); REQUIRE(oss1.str() == "highvoltage 0\n");
proxy.Call("vhighvoltage", {}, -1, GET, oss2); proxy.Call("highvoltage", {}, -1, GET, oss2);
REQUIRE(oss2.str() == "vhighvoltage 0\n"); REQUIRE(oss2.str() == "highvoltage 0\n");
} }
} }
for (int i = 0; i != det.size(); ++i) { for (int i = 0; i != det.size(); ++i) {

4
slsSupportLib/src/ToString.cpp
View File

@ -492,7 +492,7 @@ std::string ToString(const defs::dacIndex s) {
case defs::TRIMBIT_SCAN: case defs::TRIMBIT_SCAN:
return std::string("trimbit_scan"); return std::string("trimbit_scan");
case defs::HIGH_VOLTAGE: case defs::HIGH_VOLTAGE:
return std::string("vhighvoltage"); return std::string("highvoltage");
case defs::IO_DELAY: case defs::IO_DELAY:
return std::string("iodelay"); return std::string("iodelay");
default: default:
@ -850,7 +850,7 @@ template <> defs::dacIndex StringTo(const std::string &s) {
return defs::IBIAS_SFP; return defs::IBIAS_SFP;
if (s == "trimbit_scan") if (s == "trimbit_scan")
return defs::TRIMBIT_SCAN; return defs::TRIMBIT_SCAN;
if (s == "vhighvoltage") if (s == "highvoltage")
return defs::HIGH_VOLTAGE; return defs::HIGH_VOLTAGE;
if (s == "iodelay") if (s == "iodelay")
return defs::IO_DELAY; return defs::IO_DELAY;