diff --git a/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp b/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp index 6ff1131c6..201ccb64d 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp @@ -177,11 +177,26 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) { */ /*! \page acquisition - \b acquire blocking acquisition (like calling sls_detector_acquire). Starts receiver and detector, writes and processes the data, stops detector. Only get! + \c Returns (string)\c "acquire unsuccessful" if fails, else "" for MYTHEN, \c "Acquired (int)" for others, where int is number of frames caught. */ descrToFuncMap[i].m_pFuncName="acquire"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdAcquire; i++; + /*! \page acquisition + - \b busy returns \c 1 if the acquisition is active, \c 0 otherwise. Works when the acquisition is started in blocking mode. Only get! \c Returns \c (int) + */ + descrToFuncMap[i].m_pFuncName="busy"; // + descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdStatus; + i++; + + /*! \page acquisition + - status [s] starts or stops acquisition in detector in non blocking mode. \c s: [\c start, \c stop]. \c Returns the detector status: [\c running, \c error, \c transmitting, \c finished, \c waiting, \c idle]. \c Returns \c (string) + */ + descrToFuncMap[i].m_pFuncName="status"; // + descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdStatus; + i++; + /*! \page acquisition - \b data gets all data from the detector (if any) processes them and writes them to file according to the preferences already setup (MYTHEN only). Only get! */ @@ -196,20 +211,6 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) { descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdFrame; i++; - /*! \page acquisition - - \b status \c returns the detector status (string)- can be: \c running, \c error, \c transmitting, \c finished, \c waiting or \c idle; \c put can be \c start or \c stop - */ - descrToFuncMap[i].m_pFuncName="status"; // - descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdStatus; - i++; - - /*! \page acquisition - - \b busy returns \c 1 if the acquisition is active, \c 0 otherwise. Works when the acquisition is started in non-blocking mode. Only get! - */ - descrToFuncMap[i].m_pFuncName="busy"; // - descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdStatus; - i++; - /*! \page acquisition - readctr Reads the counters from the detector memory (analog detector returning values translated into number of photons - only GOTTHARD). Cannot put. */ @@ -255,7 +256,7 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) { */ /*! \page config - - \b datastream enables/disables the 0MQ data stream (0MQ threads created) from receiver to client. + - datastream enables/disables the 0MQ data stream (0MQ threads created) from receiver to client. \c Returns \c (int) */ descrToFuncMap[i].m_pFuncName="datastream"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDataStream; @@ -283,14 +284,14 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) { i++; /*! \page config - - type Sets/gets detector type (string). + - type Sets/gets detector type. \c Returns \c (string). Normally not used. Using hostname is enough. */ descrToFuncMap[i].m_pFuncName="type"; //OK descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdHostname; i++; /*! \page config - - hostname \c put adds the hostname (ot IP adress) at the end of the multi-detector structure. If used for a single controlled (i:) replaces the current hostname. Returns the list of the hostnames of the multi-detector structure. + - hostname \c put adds the hostname (ot IP adress) at the end of the multi-detector structure. If used for a single controlled (i:) replaces the current hostname. Returns the list of the hostnames of the multi-detector structure. \c Returns \c (string) */ descrToFuncMap[i].m_pFuncName="hostname"; //OK descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdHostname; @@ -323,20 +324,20 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) { */ /*! \page config - - online [i] sets the detector in online (1) or offline (0) mode + - online [i] sets the detector in online (1) or offline (0) mode. \c Returns \c (int) */ descrToFuncMap[i].m_pFuncName="online"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdOnline; i++; /*! \page config - - checkonline returns the hostnames of all detectors without connecting to them + - checkonline returns the hostnames of all detectors without connecting to them. \c Returns (string) "All online" or "[list of offline hostnames] : Not online". */ descrToFuncMap[i].m_pFuncName="checkonline"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdOnline; i++; /*! \page config - - activate Activates/Deactivates the detector. Deactivated detector does not send data. Used for EIGER only. + - activate Activates/Deactivates the detector. Deactivated detector does not send data. Used for EIGER only. \c Returns \c (int) */ descrToFuncMap[i].m_pFuncName="activate"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdOnline; @@ -350,56 +351,56 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) { */ /*! \page config - - nmod [i] sets/gets the number of modules of the detector. Used for MYTHEN only. + - nmod [i] sets/gets the number of modules of the detector. Used for MYTHEN only. \c Returns \c (int) */ descrToFuncMap[i].m_pFuncName="nmod"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDetectorSize; i++; /*! \page config - - maxmod Gets the maximum number of modules of the detector. Used for MYTHEN only. Cannot put! + - maxmod Gets the maximum number of modules of the detector. Used for MYTHEN only. Cannot put! \c Returns \c (int) */ descrToFuncMap[i].m_pFuncName="maxmod"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDetectorSize; i++; /*! \page config - - dr [i] sets/gets the dynamic range of detector. Mythen [4,8,16,24]. Eiger [4,8,16,32]. Others cannot put! + - dr [i] sets/gets the dynamic range of detector. Mythen [4,8,16,24]. Eiger [4,8,16,32]. Others cannot put! \c Returns \c (int) */ descrToFuncMap[i].m_pFuncName="dr"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDetectorSize; i++; /*! \page config - - roi [i] [xmin] [xmax] [ymin] [ymax] sets region of interest of the detector, where i is number of rois;i=0 to clear rois. Used for GOTTHARD only. + - roi [i] [xmin] [xmax] [ymin] [ymax] sets region of interest of the detector, where i is number of rois;i=0 to clear rois. Used for GOTTHARD only. \c Returns \c (int) */ descrToFuncMap[i].m_pFuncName="roi"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDetectorSize; i++; /*! \page config - - detsizechan [xmax] [ymax] sets the maximum number of channels in each dimension for complete detector set; -1 is no limit. Use for multi-detector system as first command in config file. + - detsizechan [xmax] [ymax] sets the maximum number of channels in each dimension for complete detector set; -1 is no limit. Use for multi-detector system as first command in config file. \c Returns \c ("int int") */ descrToFuncMap[i].m_pFuncName="detsizechan"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDetectorSize; i++; /*! \page config - - roimask [i] ?? + - roimask [i] ?? \c Returns \c (int) in hexadecimal */ descrToFuncMap[i].m_pFuncName="roimask"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDetectorSize; i++; /*! \page config - - flippeddatax [i] enables/disables data being flipped across x axis. 1 enables, 0 disables. Used for EIGER only. 1 for bottom half-module, 0 for top-half module. + - flippeddatax [i] enables/disables data being flipped across x axis. 1 enables, 0 disables. Used for EIGER only. 1 for bottom half-module, 0 for top-half module. \c Returns \c (int) */ descrToFuncMap[i].m_pFuncName="flippeddatax"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDetectorSize; i++; /*! \page config - - tengiga [i] enables/disables 10GbE in system (detector & receiver). 1 enabled 10GbE, 0 enables 1GbE. Used in EIGER only. + - tengiga [i] enables/disables 10GbE in system (detector & receiver). 1 enabled 10GbE, 0 enables 1GbE. Used in EIGER only. \c Returns \c (int) */ descrToFuncMap[i].m_pFuncName="tengiga"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdReceiver; @@ -413,7 +414,7 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) { */ /*! \page config - - flags [flag] sets/gets the readout flags to mode. Options: none, storeinram, tot, continous, parallel, nonparallel, safe, digital, analog_digital, unknown. Used for MYTHEN and EIGER only. + - flags [flag] sets/gets the readout flags to mode. Options: none, storeinram, tot, continous, parallel, nonparallel, safe, digital, analog_digital, unknown. Used for MYTHEN and EIGER only. \c Returns \c (string). put takes one string and \c returns concatenation of all active flags separated by spaces. */ descrToFuncMap[i].m_pFuncName="flags"; descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdAdvanced; @@ -422,7 +423,7 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) { /*! \page config - extsig:[i] [flag] sets/gets the mode of the external signal i. Options: \c off, \c gate_in_active_high, \c gate_in_active_low, \c trigger_in_rising_edge, \c trigger_in_falling_edge, \c ro_trigger_in_rising_edge, \c ro_trigger_in_falling_edge, \c gate_out_active_high, \c gate_out_active_low, \c trigger_out_rising_edge, \c trigger_out_falling_edge, \c ro_trigger_out_rising_edge, - \c ro_trigger_out_falling_edge. \n Used in MYTHEN, GOTTHARD, PROPIX only. + \c ro_trigger_out_falling_edge. \n Used in MYTHEN, GOTTHARD, PROPIX only. \c Returns \c (string) */ descrToFuncMap[i].m_pFuncName="extsig"; /* find command! */ descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdAdvanced; @@ -432,15 +433,15 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) { /* fpga */ - /*! \page test - - programfpga [file] programs the FPGA with file f (with .pof extension). Used for JUNGFRAU and new chiptestboard only. Only put! + /*! \page config + - programfpga [file] programs the FPGA with file f (with .pof extension). Used for JUNGFRAU, MOENCH only. Only put! \c Returns \c ("successful", "unsuccessful") */ descrToFuncMap[i].m_pFuncName="programfpga"; descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdAdvanced; i++; - /*! \page test - - resetfpga [f] resets FPGA, where f can be any value. Used for JUNGFRAU and new chiptestboard only. Only put! + /*! \page config + - resetfpga [f] resets FPGA, where f can be any value. Used for JUNGFRAU only. Only put! \c Returns \c ("successful", "unsuccessful") */ descrToFuncMap[i].m_pFuncName="resetfpga"; descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdAdvanced; @@ -454,35 +455,35 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) { */ /*! \page config - - powerchip [i] Powers on/off the chip. 1 powers on, 0 powers off. Can also get the power status. Used for JUNGFRAU only. + - powerchip [i] Powers on/off the chip. 1 powers on, 0 powers off. Can also get the power status. Used for JUNGFRAU only. \c Returns \c (int) */ descrToFuncMap[i].m_pFuncName="powerchip"; descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdAdvanced; i++; /*! \page config - - led [i] sets/gets the led status. 1 on, 0 off. Used for MOENCH only ?? + - led [i] sets/gets the led status. 1 on, 0 off. Used for MOENCH only ?? \c Returns \c (int) */ descrToFuncMap[i].m_pFuncName="led"; descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdAdvanced; i++; /*! \page config - - pulse [n] [x] [y] pulses pixel at coordinates (x,y) n number of times. Used in EIGER only. Only put!" + - pulse [n] [x] [y] pulses pixel at coordinates (x,y) n number of times. Used in EIGER only. Only put! \c Returns \c ("successful", "unsuccessful") */ descrToFuncMap[i].m_pFuncName="pulse"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdPulse; i++; /*! \page config - - pulsenmove [n] [x] [y] pulses pixel n number of times and moves relatively by x value (x axis) and y value(y axis). Used in EIGER only. Only put!" + - pulsenmove [n] [x] [y] pulses pixel n number of times and moves relatively by x value (x axis) and y value(y axis). Used in EIGER only. Only put! \c Returns \c ("successful", "unsuccessful") */ descrToFuncMap[i].m_pFuncName="pulsenmove"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdPulse; i++; /*! \page config - - pulsechip [n]pulses chip n number of times, while n=-1 will reset it to normal mode. Used in EIGER only. Only put!" + - pulsechip [n]pulses chip n number of times, while n=-1 will reset it to normal mode. Used in EIGER only. Only put! \c Returns \c ("successful", "unsuccessful") */ descrToFuncMap[i].m_pFuncName="pulsechip"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdPulse; @@ -498,49 +499,49 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) { */ /*! \page config - - moduleversion:[i] Gets the firmware version of module i. Used for MYTHEN only. Only get! + - moduleversion:[i] Gets the firmware version of module i. Used for MYTHEN only. Only get! \c Returns \c (long int) in hexadecimal or "undefined module number" */ descrToFuncMap[i].m_pFuncName="moduleversion"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSN; i++; /*! \page config - - detectornumber Gets the serial number or MAC of detector. Only get! + - detectornumber Gets the serial number or MAC of detector. Only get! \c Returns \c (long int) in hexadecimal */ descrToFuncMap[i].m_pFuncName="detectornumber"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSN; i++; /*! \page config - - modulenumber:[i] Gets the serial number of module i. Used for MYTHEN only. Only get! + - modulenumber:[i] Gets the serial number of module i. Used for MYTHEN only. Only get! \c Returns \c (long int) in hexadecimal or "undefined module number" */ descrToFuncMap[i].m_pFuncName="modulenumber"; /* find command! */ descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSN; i++; /*! \page config - - detectorversion Gets the firmware version of detector. Only get! + - detectorversion Gets the firmware version of detector. Only get! \c Returns \c (long int) in hexadecimal */ descrToFuncMap[i].m_pFuncName="detectorversion"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSN; i++; /*! \page config - - softwareversion Gets the software version of detector server. Only get! + - softwareversion Gets the software version of detector server. Only get! \c Returns \c (long int) in hexadecimal */ descrToFuncMap[i].m_pFuncName="softwareversion"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSN; i++; /*! \page config - - thisversion Gets the software version of this client software. Only get! + - thisversion Gets the software version of this client software. Only get! \c Returns \c (long int) in hexadecimal */ descrToFuncMap[i].m_pFuncName="thisversion"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSN; i++; /*! \page config - - receiverversion Gets the software version of receiver. Only get! + - receiverversion Gets the software version of receiver. Only get! \c Returns \c (long int) in hexadecimal */ descrToFuncMap[i].m_pFuncName="receiverversion"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSN; @@ -550,77 +551,79 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) { /*! \page timing - - timing [mode] sets/gets synchronization mode of the detector. Mode: auto, trigger, ro_trigger, gating, triggered_gating - */ + - timing [mode] sets/gets synchronization mode of the detector. Mode: auto, trigger, ro_trigger, gating, triggered_gating (string) + */ descrToFuncMap[i].m_pFuncName="timing"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdTiming; i++; + /*! \page timing - - exptime [i] sets/gets exposure time in s + - exptime [i] sets/gets exposure time in s. \c Returns \c (double with 9 decimal digits) */ descrToFuncMap[i].m_pFuncName="exptime"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdTimer; i++; /*! \page timing - - subexptime [i] sets/gets sub exposure time in s. Used in EIGER only in 32 bit mode. + - subexptime [i] sets/gets sub exposure time in s. Used in EIGER only in 32 bit mode. \c Returns \c (double with 9 decimal digits) */ descrToFuncMap[i].m_pFuncName="subexptime"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdTimer; i++; /*! \page timing - - period [i] sets/gets frame period in s. + /*! \page config + - period [i] sets/gets frame period in s. \c Returns \c (double with 9 decimal digits) */ descrToFuncMap[i].m_pFuncName="period"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdTimer; i++; /*! \page config - - delay [i] sets/gets delay in s. Used in MYTHEN, GOTTHARD only + - delay [i] sets/gets delay in s. Used in MYTHEN, GOTTHARD only. \c Returns \c (double with 9 decimal digits) */ descrToFuncMap[i].m_pFuncName="delay"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdTimer; i++; /*! \page timing - - gates [i] sets/gets number of gates. Used in MYTHEN, GOTTHARD, EIGER only + - gates [i] sets/gets number of gates. Used in MYTHEN, GOTTHARD only. \c Returns \c (long long int) */ descrToFuncMap[i].m_pFuncName="gates"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdTimer; i++; /*! \page timing - - gates [i] sets/gets number of frames. If \c timing is not \c auto, then it is the number of frames per cycle/trigger. + - frames [i] sets/gets number of frames. If \c timing is not \c auto, then it is the number of frames per cycle/trigger. \c Returns \c (long long int) */ descrToFuncMap[i].m_pFuncName="frames"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdTimer; i++; /*! \page timing - - cycles [i] sets/gets number of triggers. Timing mode should be set appropriately. + - cycles [i] sets/gets number of triggers. Timing mode should be set appropriately. \c Returns \c (long long int) */ descrToFuncMap[i].m_pFuncName="cycles"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdTimer; i++; /*! \page timing - - probes [i] sets/gets number of probes to accumulate. When setting, max 3! cycles should be set to 1, frames to the number of pump-probe events. Used in MYTHEN only + - probes [i] sets/gets number of probes to accumulate. When setting, max 3! cycles should be set to 1, frames to the number of pump-probe events. Used in MYTHEN only. \c Returns \c (long long int) */ descrToFuncMap[i].m_pFuncName="probes"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdTimer; i++; /*! \page timing - - measurements [i] sets/gets number of measurements. + - measurements [i] sets/gets number of measurements. \c Returns \c (long long int) */ descrToFuncMap[i].m_pFuncName="measurements"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdTimer; i++; /*! \page timing - - samples [i] sets/gets number of samples expected from the jctb. Used in CHIP TEST BOARD only. + - samples [i] sets/gets number of samples expected from the jctb. Used in CHIP TEST BOARD only. \c Returns \c (long long int) */ descrToFuncMap[i].m_pFuncName="samples"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdTimer; @@ -629,49 +632,49 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) { /* read only timers */ /*! \page timing - - exptimel gets exposure time left. Used in MYTHEN, GOTTHARD only. Only get! + - exptimel gets exposure time left. Used in MYTHEN, GOTTHARD only. Only get! \c Returns \c (double with 9 decimal digits) */ descrToFuncMap[i].m_pFuncName="exptimel"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdTimeLeft; i++; /*! \page timing - - periodl gets frame period left. Used in MYTHEN, GOTTHARD only. Only get! + - periodl gets frame period left. Used in MYTHEN, GOTTHARD only. Only get! \c Returns \c (double with 9 decimal digits) */ descrToFuncMap[i].m_pFuncName="periodl"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdTimeLeft; i++; /*! \page timing - - delayl gets delay left. Used in MYTHEN, GOTTHARD only. Only get! + - delayl gets delay left. Used in MYTHEN, GOTTHARD only. Only get! \c Returns \c (double with 9 decimal digits) */ descrToFuncMap[i].m_pFuncName="delayl"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdTimeLeft; i++; /*! \page timing - - gatesl gets number of gates left. Used in MYTHEN, GOTTHARD only. Only get! + - gatesl gets number of gates left. Used in MYTHEN, GOTTHARD only. Only get! \c Returns \c (double with 9 decimal digits) */ descrToFuncMap[i].m_pFuncName="gatesl"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdTimeLeft; i++; /*! \page config - - framesl gets number of frames left. Used in MYTHEN, GOTTHARD only. Only get! + - framesl gets number of frames left. Used in MYTHEN, GOTTHARD only. Only get! \c Returns \c (double with 9 decimal digits) */ descrToFuncMap[i].m_pFuncName="framesl"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdTimeLeft; i++; /*! \page timing - - cyclesl gets number of cylces left. Used in MYTHEN, GOTTHARD only. Only get! + - cyclesl gets number of cylces left. Used in MYTHEN, GOTTHARD only. Only get! \c Returns \c (double with 9 decimal digits) */ descrToFuncMap[i].m_pFuncName="cyclesl"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdTimeLeft; i++; /*! \page timing - - probesl gets number of probes left. Used in MYTHEN, GOTTHARD only. Only get! + - probesl gets number of probes left. Used in MYTHEN, GOTTHARD only. Only get! \c Returns \c (double with 9 decimal digits) */ descrToFuncMap[i].m_pFuncName="probesl"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdTimeLeft; @@ -709,91 +712,91 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) { */ /*! \page config - - clkdivider [i] sets/gets the readout clock divider. EIGER, JUNGFRAU [0(fast speed), 1(half speed), 2(quarter speed)]. MYTHEN[???] + - clkdivider [i] sets/gets the readout clock divider. EIGER, JUNGFRAU [0(fast speed), 1(half speed), 2(quarter speed)]. MYTHEN[???]. \c Returns \c (int) */ descrToFuncMap[i].m_pFuncName="clkdivider"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSpeed; i++; /*! \page config - - setlength [i] sets/gets length of set/reset signals (in clock cycles). Used in MYTHEN only + - setlength [i] sets/gets length of set/reset signals (in clock cycles). Used in MYTHEN only. \c Returns \c (int) */ descrToFuncMap[i].m_pFuncName="setlength"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSpeed; i++; /*! \page config - - waitstates [i] sets/gets waitstates of the bus interface (in clock cycles). Used in MYTHEN only + - waitstates [i] sets/gets waitstates of the bus interface (in clock cycles). Used in MYTHEN only. \c Returns \c (int) */ descrToFuncMap[i].m_pFuncName="waitstates"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSpeed; i++; /*! \page config - - totdivider [i] sets/gets clock divider in tot mode. Used in MYTHEN only + - totdivider [i] sets/gets clock divider in tot mode. Used in MYTHEN only. \c Returns \c (int) */ descrToFuncMap[i].m_pFuncName="totdivider"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSpeed; i++; /*! \page config - - totdutycycle [i] sets/gets duty cycle of the tot clock. Used in MYTHEN only + - totdutycycle [i] sets/gets duty cycle of the tot clock. Used in MYTHEN only. \c Returns \c (int) */ descrToFuncMap[i].m_pFuncName="totdutycycle"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSpeed; i++; /*! \page config - - phasestep [i] Only put for gotthard. Moves the phase of the ADC clock. + - phasestep [i] Only put for gotthard. Moves the phase of the ADC clock.\c Returns \c (int) */ descrToFuncMap[i].m_pFuncName="phasestep"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSpeed; i++; /*! \page config - - oversampling [i] Sets/gets the number of adcsamples per clock. For the new chiptestboard. + - oversampling [i] Sets/gets the number of adcsamples per clock. For the new chiptestboard.\c Returns \c (int) */ descrToFuncMap[i].m_pFuncName="oversampling"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSpeed; i++; /*! \page config - - adcclk [i] sets/gets the ADC clock frequency in MHz. For the new chiptestboard! + - adcclk [i] sets/gets the ADC clock frequency in MHz. For the new chiptestboard!\c Returns \c (int) */ descrToFuncMap[i].m_pFuncName="adcclk"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSpeed; i++; /*! \page config - - adcphase [i] Sets/gets the ADC clock frequency in MHz. For the new chiptestboard! + - adcphase [i] Sets/gets the ADC clock frequency in MHz. For the new chiptestboard!\c Returns \c (int) */ descrToFuncMap[i].m_pFuncName="adcphase"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSpeed; i++; /*! \page config - - adcpipeline [i] Sets/gets the pipeline of the ADC. For the new chiptestbaord! + - adcpipeline [i] Sets/gets the pipeline of the ADC. For the new chiptestbaord!\c Returns \c (int) */ descrToFuncMap[i].m_pFuncName="adcpipeline"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSpeed; i++; /*! \page config - - dbitclk [i] Sets/gets the clock frequency of the latching of the digital bits in MHz. For the new chiptestboard! + - dbitclk [i] Sets/gets the clock frequency of the latching of the digital bits in MHz. For the new chiptestboard!\c Returns \c (int) */ descrToFuncMap[i].m_pFuncName="dbitclk"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSpeed; i++; /*! \page config - - dbitphase [i] Sets/gets the phase of the clock for latching of the digital bits. For the new chiptestboard!??? + - dbitphase [i] Sets/gets the phase of the clock for latching of the digital bits. For the new chiptestboard!?\c Returns \c (int) */ descrToFuncMap[i].m_pFuncName="dbitphase"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSpeed; i++; /*! \page config - - dbitpipeline [i] Sets/gets the pipeline of the latching of the digital bits. For the new chiptestbaord! + - dbitpipeline [i] Sets/gets the pipeline of the latching of the digital bits. For the new chiptestbaord!\c Returns \c (int) */ descrToFuncMap[i].m_pFuncName="dbitpipeline"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSpeed; @@ -807,7 +810,7 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) { */ /*! \page config - - config [fname] sets/saves detector/receiver to configuration contained in fname. Same as executing sls_detector_put for every line. Normally a one time operation. + - config [fname] sets/saves detector/receiver to configuration contained in fname. Same as executing sls_detector_put for every line. Normally a one time operation. \c Returns \c (string) fname */ descrToFuncMap[i].m_pFuncName="config"; descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdConfiguration; @@ -815,21 +818,21 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) { /* settings dump/retrieve */ /*! \page config - - rx_printconfig prints the receiver configuration. Only get! + - rx_printconfig prints the receiver configuration. Only get! \c Returns \c (string) */ descrToFuncMap[i].m_pFuncName="rx_printconfig"; descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdConfiguration; i++; /*! \page config - - parameters [fname] sets/saves detector parameters contained in fname. Normally once per different measurement. + - parameters [fname] sets/saves detector parameters contained in fname. Normally once per different measurement. \c Returns \c (string) fname */ descrToFuncMap[i].m_pFuncName="parameters"; descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdConfiguration; i++; /*! \page config - - setup [fname] sets/saves detector complete setup contained in fname (extensions automatically generated), including trimfiles, ff coefficients etc. + - setup [fname] sets/saves detector complete setup contained in fname (extensions automatically generated), including trimfiles, ff coefficients etc. \c Returns \c (string) fname */ descrToFuncMap[i].m_pFuncName="setup"; descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdConfiguration; @@ -844,7 +847,7 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) { Commands to setup the data processing (mainly MYTHEN related) */ /*! \page data - - flatfield [fn] \c put sets flatfield file to \c fn (relative to \c ffdir). \get returns the flatfield file name relative to \c ffdir (string). If \fn is specified, it writes the flat field correction factors and errors to \c fn. + - flatfield [fn] \c put sets flatfield file to \c fn (relative to \c ffdir). \get returns the flatfield file name relative to \c ffdir (string). If \fn is specified, it writes the flat field correction factors and errors to \c fn. \c Returns \c (string) fn \c none disables flat field corrections. */ descrToFuncMap[i].m_pFuncName="flatfield"; // @@ -852,14 +855,14 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) { i++; /*! \page data - - ffdir [d] Sets/gets the directory in which the flat field file is located. + - ffdir [d] Sets/gets the directory in which the flat field file is located. \c Returns \c (string) ffdir */ descrToFuncMap[i].m_pFuncName="ffdir"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdFlatField; i++; /*! \page data - - ratecorr [ns] Returns the dead time used for rate correections in ns (int). \c put sets the deadtime correction constant in ns, -1 will set it to default tau of settings (0 unset). + - ratecorr [ns] Returns the dead time used for rate correections in ns (int). \c put sets the deadtime correction constant in ns, -1 will set it to default tau of settings (0 unset). \c Returns \c (double with 9 decimal digit precision) */ descrToFuncMap[i].m_pFuncName="ratecorr"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdRateCorr; @@ -971,27 +974,27 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) { commands to setup settings/trim/cal directories */ /*! \page settings - - settingsdir [dir] Sets/gets the directory where the settings files are located (string) + - settingsdir [dir] Sets/gets the directory where the settings files are located. \c Returns \c (string) dir */ descrToFuncMap[i].m_pFuncName="settingsdir"; //OK descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSettingsDir; i++; /*! \page settings - - trimdir [dir] obsolete \c settingsdir + - trimdir [dir] obsolete \c settingsdir. \c Returns \c (string) dir */ descrToFuncMap[i].m_pFuncName="trimdir"; //OK descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSettingsDir; i++; /*! \page settings - - caldir [dir] Sets/gets the directory where the calibration files are located (string) + - caldir [dir] Sets/gets the directory where the calibration files are located. \c Returns \c (string) dir */ descrToFuncMap[i].m_pFuncName="caldir"; //OK descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdCalDir; i++; /*! \page settings - - trimen [n e0 e1...e(n-1)] Sets/gets the number of energies n at which the detector has default trim file and their values in eV (int) + - trimen [n e0 e1...e(n-1)] Sets/gets the number of energies n at which the detector has default trim file and their values in eV (int). \c Returns \c (int int...) n e0 e1...e(n-1) */ descrToFuncMap[i].m_pFuncName="trimen"; descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdTrimEn; @@ -1006,49 +1009,49 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) { /*! \page settings - settings [s] sets/gets the settings of the detector. Options: \c standard, \c fast, \c highgain, \c dynamicgain, \c lowgain, \c mediumgain, \c veryhighgain, \c lownoise, \c dynamichg0, \c fixgain1, \c fixgain2, \c forceswitchg1, \c forceswitchg2. - \n In Eiger, only sets in client shared memory. Use \c threshold or \c thresholdnotb to pass to detector. Gets from detector. + \n In Eiger, only sets in client shared memory. Use \c threshold or \c thresholdnotb to pass to detector. Gets from detector. \c Returns \c (string) s */ descrToFuncMap[i].m_pFuncName="settings"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSettings; i++; /*! \page settings - - threshold [eV] [sett] sets/gets the detector threshold in eV. sett is optional and if provided also sets the settings. Use this for Eiger instead of \c settings. + - threshold [eV] [sett] sets/gets the detector threshold in eV. sett is optional and if provided also sets the settings. Use this for Eiger instead of \c settings. \c Returns \c (int) */ descrToFuncMap[i].m_pFuncName="threshold"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSettings; i++; /*! \page settings - - thresholdnotb [eV] [sett] sets/gets the detector threshold in eV without loading trimbits. sett is optional and if provided also sets the settings. Use this for Eiger instead of \c settings. + - thresholdnotb [eV] [sett] sets/gets the detector threshold in eV without loading trimbits. sett is optional and if provided also sets the settings. Use this for Eiger instead of \c settings. \c Returns \c (int) */ descrToFuncMap[i].m_pFuncName="thresholdnotb"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSettings; i++; /*! \page settings - - trimbits [fname] loads/stores the trimbits to/from the detector. If no extension is specified, the serial number of each module will be attached. + - trimbits [fname] loads/stores the trimbits to/from the detector. If no extension is specified, the serial number of each module will be attached. \c Returns \c (string) fname */ descrToFuncMap[i].m_pFuncName="trimbits"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSettings; i++; /*! \page settings - - trim:[mode] [fname] trims the detector according to mode and saves resulting trimbits to file. Mode: noise, beam, improve, fix. Used in MYTHEN only. Only put! + - trim:[mode] [fname] trims the detector according to mode and saves resulting trimbits to file. Mode: noise, beam, improve, fix. Used in MYTHEN only. Only put! \c Returns \c ("done") */ descrToFuncMap[i].m_pFuncName="trim"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSettings; i++; /*! \page settings - - trimval [i] sets all trimbits to i. Used in EIGER only. + - trimval [i] sets all trimbits to i. Used in EIGER only. \c Returns \c (int) */ descrToFuncMap[i].m_pFuncName="trimval"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSettings; i++; /*! \page settings - - pedestal [i] starts acquisition for i frames, calculates pedestal and writes back to fpga. Used in GOTTHARD only. Only put! + - pedestal [i] starts acquisition for i frames, calculates pedestal and writes back to fpga. Used in GOTTHARD only. Only put! \c Returns \c (int) */ descrToFuncMap[i].m_pFuncName="pedestal"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSettings; @@ -1063,140 +1066,140 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) { */ /*! \page settings - - vthreshold [i] [mv] Sets/gets detector threshold voltage for single photon counters. Normally in DAC units unless \c mv is specified at the end of the command line (int) + - vthreshold [i] [mv] Sets/gets detector threshold voltage for single photon counters. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"]) */ descrToFuncMap[i].m_pFuncName="vthreshold"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC; i++; /*! \page settings - - vcalibration [i] [mv] Sets/gets the voltage of the calibration pulses. Normally in DAC units unless \c mv is specified at the end of the command line (int) + - vcalibration [i] [mv] Sets/gets the voltage of the calibration pulses. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"]) */ descrToFuncMap[i].m_pFuncName="vcalibration"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC; i++; /*! \page settings - - vtrimbit [i] [mv] Sets/gets the voltage to set the width of the trimbits. Normally in DAC units unless \c mv is specified at the end of the command line (int) + - vtrimbit [i] [mv] Sets/gets the voltage to set the width of the trimbits. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"]) */ descrToFuncMap[i].m_pFuncName="vtrimbit"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC; i++; /*! \page settings - - vpreamp [i] [mv] Sets/gets the voltage to define the preamplifier feedback resistance. Normally in DAC units unless \c mv is specified at the end of the command line (int) + - vpreamp [i] [mv] Sets/gets the voltage to define the preamplifier feedback resistance. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"]) */ descrToFuncMap[i].m_pFuncName="vpreamp"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC; i++; /*! \page settings - - vhaper1 [i] [mv] Sets/gets the voltage to define the feedback resistance of the first shaper. Normally in DAC units unless \c mv is specified at the end of the command line (int) + - vhaper1 [i] [mv] Sets/gets the voltage to define the feedback resistance of the first shaper. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"]) */ descrToFuncMap[i].m_pFuncName="vshaper1"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC; i++; /*! \page settings - - vshaper2 [i] [mv] Sets/gets the voltage to define the feedback resistance of the second shaper. Normally in DAC units unless \c mv is specified at the end of the command line (int) + - vshaper2 [i] [mv] Sets/gets the voltage to define the feedback resistance of the second shaper. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"]) */ descrToFuncMap[i].m_pFuncName="vshaper2"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC; i++; /*! \page settings - - vhighvoltage [i] Sets/gets the high voltage to the sensor in V (int). + - vhighvoltage [i] Sets/gets the high voltage to the sensor in V. \c Returns \c (int ["mV"]). */ descrToFuncMap[i].m_pFuncName="vhighvoltage"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC; i++; /*! \page settings - - vapower [i] Sets/gets the analog power supply for the old chiptest board in DAC units (int) + - vapower [i] Sets/gets the analog power supply for the old chiptest board in DAC units. \c Returns \c (int ["mV"]) */ descrToFuncMap[i].m_pFuncName="vapower"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC; i++; /*! \page settings - - vddpower [i] Sets/gets the digital power supply for the old chiptest board in DAC units (int) + - vddpower [i] Sets/gets the digital power supply for the old chiptest board in DAC units. \c Returns \c (int ["mV"]) */ descrToFuncMap[i].m_pFuncName="vddpower"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC; i++; /*! \page settings - - vshpower [i] Sets/gets the comparator power supply for the old chiptest board in DAC units (int) + - vshpower [i] Sets/gets the comparator power supply for the old chiptest board in DAC units. \c Returns \c (int ["mV"]) */ descrToFuncMap[i].m_pFuncName="vshpower"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC; i++; /*! \page settings - - viopower [i] Sets/gets the power supply of the FPGA I/Os for the old chiptest board in DAC units (int) + - viopower [i] Sets/gets the power supply of the FPGA I/Os for the old chiptest board in DAC units. \c Returns \c (int ["mV"]) */ descrToFuncMap[i].m_pFuncName="viopower"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC; i++; /*! \page settings - - vrefds [i] [mv] Sets/gets vrefds. Normally in DAC units unless \c mv is specified at the end of the command line (int) + - vrefds [i] [mv] Sets/gets vrefds. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"]) */ descrToFuncMap[i].m_pFuncName="vref_ds"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC; i++; /*! \page settings - - vcascn_pb [i] [mv] Sets/gets vcascn_pb. Normally in DAC units unless \c mv is specified at the end of the command line (int) + - vcascn_pb [i] [mv] Sets/gets vcascn_pb. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"]) */ descrToFuncMap[i].m_pFuncName="vcascn_pb"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC; i++; /*! \page settings - - vcasc_pb [i] [mv] Sets/gets vcasc_pb. Normally in DAC units unless \c mv is specified at the end of the command line (int) + - vcasc_pb [i] [mv] Sets/gets vcasc_pb. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"]) */ descrToFuncMap[i].m_pFuncName="vcascp_pb"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC; i++; /*! \page settings - - vout_cm [i] [mv] Sets/gets vout_cm. Normally in DAC units unless \c mv is specified at the end of the command line (int) + - vout_cm [i] [mv] Sets/gets vout_cm. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"]) */ descrToFuncMap[i].m_pFuncName="vout_cm"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC; i++; /*! \page settings - - vcasc_out [i] [mv] Sets/gets vcasc_out. Normally in DAC units unless \c mv is specified at the end of the command line (int) + - vcasc_out [i] [mv] Sets/gets vcasc_out. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"]) */ descrToFuncMap[i].m_pFuncName="vcasc_out"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC; i++; /*! \page settings - - vin_com [i] [mv] Sets/gets vin_com. Normally in DAC units unless \c mv is specified at the end of the command line (int) + - vin_com [i] [mv] Sets/gets vin_com. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"]) */ descrToFuncMap[i].m_pFuncName="vin_cm"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC; i++; /*! \page settings - - vref_comp [i] [mv] Sets/gets vref_comp. Normally in DAC units unless \c mv is specified at the end of the command line (int) + - vref_comp [i] [mv] Sets/gets vref_comp. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"]) */ descrToFuncMap[i].m_pFuncName="vref_comp"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC; i++; /*! \page settings - - ib_test_c [i] [mv] Sets/gets ib_test_c. Normally in DAC units unless \c mv is specified at the end of the command line (int) + - ib_test_c [i] [mv] Sets/gets ib_test_c. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"]) */ descrToFuncMap[i].m_pFuncName="ib_test_c"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC; i++; /*! \page settings - - dac[0..7] [i] [mv] Sets/gets dac[0..7] for MOENCH02. Normally in DAC units unless \c mv is specified at the end of the command line (int) + - dac[0..7] [i] [mv] Sets/gets dac[0..7] for MOENCH02. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"]) */ descrToFuncMap[i].m_pFuncName="dac0"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC; @@ -1231,119 +1234,119 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) { i++; /*! \page settings - - vsvp [i] [mv] Sets/gets vsvp. Normally in DAC units unless \c mv is specified at the end of the command line (int) + - vsvp [i] [mv] Sets/gets vsvp. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"]) */ descrToFuncMap[i].m_pFuncName="vsvp"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC; i++; /*! \page settings - - vsvn [i] [mv] Sets/gets vsvn. Normally in DAC units unless \c mv is specified at the end of the command line (int) + - vsvn [i] [mv] Sets/gets vsvn. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"]) */ descrToFuncMap[i].m_pFuncName="vsvn"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC; i++; /*! \page settings - - vtr [i] [mv] Sets/gets vtr. Normally in DAC units unless \c mv is specified at the end of the command line (int) + - vtr [i] [mv] Sets/gets vtr. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"]) */ descrToFuncMap[i].m_pFuncName="vtr"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC; i++; /*! \page settings - - vrf [i] [mv] Sets/gets vrf. Normally in DAC units unless \c mv is specified at the end of the command line (int) + - vrf [i] [mv] Sets/gets vrf. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"]) */ descrToFuncMap[i].m_pFuncName="vrf"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC; i++; /*! \page settings - - vrs [i] [mv] Sets/gets vrs. Normally in DAC units unless \c mv is specified at the end of the command line (int) + - vrs [i] [mv] Sets/gets vrs. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"]) */ descrToFuncMap[i].m_pFuncName="vrs"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC; i++; /*! \page settings - - vtgstv [i] [mv] Sets/gets vtgstv. Normally in DAC units unless \c mv is specified at the end of the command line (int) + - vtgstv [i] [mv] Sets/gets vtgstv. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"]) */ descrToFuncMap[i].m_pFuncName="vtgstv"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC; i++; /*! \page settings - - vcmp_ll [i] [mv] Sets/gets vcmp_ll. Normally in DAC units unless \c mv is specified at the end of the command line (int) + - vcmp_ll [i] [mv] Sets/gets vcmp_ll. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"]) */ descrToFuncMap[i].m_pFuncName="vcmp_ll"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC; i++; /*! \page settings - - vcmp_lr [i] [mv] Sets/gets vcmp_lr. Normally in DAC units unless \c mv is specified at the end of the command line (int) + - vcmp_lr [i] [mv] Sets/gets vcmp_lr. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"]) */ descrToFuncMap[i].m_pFuncName="vcmp_lr"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC; i++; /*! \page settings - - vcal_l [i] [mv] Sets/gets vcal_l. Normally in DAC units unless \c mv is specified at the end of the command line (int) + - vcal_l [i] [mv] Sets/gets vcal_l. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"]) */ descrToFuncMap[i].m_pFuncName="vcall"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC; i++; /*! \page settings - - vcomp_rl [i] [mv] Sets/gets vcomp_rl. Normally in DAC units unless \c mv is specified at the end of the command line (int) + - vcomp_rl [i] [mv] Sets/gets vcomp_rl. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"]) */ descrToFuncMap[i].m_pFuncName="vcmp_rl"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC; i++; /*! \page settings - - vcomp_rr [i] [mv] Sets/gets vcomp_rr. Normally in DAC units unless \c mv is specified at the end of the command line (int) + - vcomp_rr [i] [mv] Sets/gets vcomp_rr. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"]) */ descrToFuncMap[i].m_pFuncName="vcmp_rr"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC; i++; /*! \page settings - - rxb_rb [i] [mv] Sets/gets rxb_rb. Normally in DAC units unless \c mv is specified at the end of the command line (int) + - rxb_rb [i] [mv] Sets/gets rxb_rb. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"]) */ descrToFuncMap[i].m_pFuncName="rxb_rb"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC; i++; /*! \page settings - - rxb_lb [i] [mv] Sets/gets rxb_lb. Normally in DAC units unless \c mv is specified at the end of the command line (int) + - rxb_lb [i] [mv] Sets/gets rxb_lb. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"]) */ descrToFuncMap[i].m_pFuncName="rxb_lb"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC; i++; /*! \page settings - - vcp [i] [mv] Sets/gets vcp. Normally in DAC units unless \c mv is specified at the end of the command line (int) + - vcp [i] [mv] Sets/gets vcp. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"]) */ descrToFuncMap[i].m_pFuncName="vcp"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC; i++; /*! \page settings - - vcn [i] [mv] Sets/gets vcn. Normally in DAC units unless \c mv is specified at the end of the command line (int) + - vcn [i] [mv] Sets/gets vcn. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"]) */ descrToFuncMap[i].m_pFuncName="vcn"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC; i++; /*! \page settings - - vis [i] [mv] Sets/gets vis. Normally in DAC units unless \c mv is specified at the end of the command line (int) + - vis [i] [mv] Sets/gets vis. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"]) */ descrToFuncMap[i].m_pFuncName="vis"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC; i++; /*! \page settings - - iodelay [i] [mv] Sets/gets iodelay. Normally in DAC units unless \c mv is specified at the end of the command line (int) + - iodelay [i] [mv] Sets/gets iodelay. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"]) */ descrToFuncMap[i].m_pFuncName="iodelay"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC; @@ -1351,7 +1354,7 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) { /*! \page settings - - dac:j [i] [mv] Sets/gets value for DAC number j for the new chiptestboard. Normally in DAC units unless \c mv is specified at the end of the command line (int) + - dac:j [i] [mv] Sets/gets value for DAC number j for the new chiptestboard. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"]) */ descrToFuncMap[i].m_pFuncName="dac"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC; @@ -1360,7 +1363,7 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) { /*! \page settings - - adcvpp [i] Sets/gets the Vpp of the ADC 0 -> 1V ; 1 -> 1.14V ; 2 -> 1.33V ; 3 -> 1.6V ; 4 -> 2V (int) + - adcvpp [i] Sets/gets the Vpp of the ADC 0 -> 1V ; 1 -> 1.14V ; 2 -> 1.33V ; 3 -> 1.6V ; 4 -> 2V . \c Returns \c (int ["mV"]) */ descrToFuncMap[i].m_pFuncName="adcvpp"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC; @@ -1368,35 +1371,35 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) { /*! \page settings - - v_a [i] mv Sets/gets value for Va on the new chiptest board. Must be in mV (int) + - v_a [i] mv Sets/gets value for Va on the new chiptest board. Must be in mV. \c Returns \c (int ["mV"]) */ descrToFuncMap[i].m_pFuncName="v_a"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC; i++; /*! \page settings - - v_b [i] mv Sets/gets value for Vb on the new chiptest board. Must be in mV (int) + - v_b [i] mv Sets/gets value for Vb on the new chiptest board. Must be in mV. \c Returns \c (int ["mV"]) */ descrToFuncMap[i].m_pFuncName="v_b"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC; i++; /*! \page settings - - v_c [i] mv Sets/gets value for Vc on the new chiptest board. Must be in mV (int) + - v_c [i] mv Sets/gets value for Vc on the new chiptest board. Must be in mV. \c Returns \c (int ["mV"]) */ descrToFuncMap[i].m_pFuncName="v_c"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC; i++; /*! \page settings - - v_d [i] mv Sets/gets value for Vd on the new chiptest board. Must be in mV (int) + - v_d [i] mv Sets/gets value for Vd on the new chiptest board. Must be in mV. \c Returns \c (int ["mV"]) */ descrToFuncMap[i].m_pFuncName="v_d"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC; i++; /*! \page settings - - v_io [i] mv Sets/gets value for Vio on the new chiptest board. Must be in mV (int) + - v_io [i] mv Sets/gets value for Vio on the new chiptest board. Must be in mV. \c Returns \c (int ["mV"]) */ descrToFuncMap[i].m_pFuncName="v_io"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC; @@ -1404,14 +1407,14 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) { /*! \page settings - - v_chip [i] mv Sets/gets value for Vchip on the new chiptest board. Must be in mV (int). Normally don't use it! + - v_chip [i] mv Sets/gets value for Vchip on the new chiptest board. Must be in mV. \c Returns \c (int ["mV"]). Normally don't use it! */ descrToFuncMap[i].m_pFuncName="v_chip"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC; i++; /*! \page settings - - v_limit [i] mv Sets/gets a soft limit for the power supplies and the DACs on the new chiptest board. Must be in mV (int) + - v_limit [i] mv Sets/gets a soft limit for the power supplies and the DACs on the new chiptest board. Must be in mV. \c Returns \c (int ["mV"]) */ descrToFuncMap[i].m_pFuncName="v_limit"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDAC; @@ -1424,49 +1427,49 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) { */ /*! \page settings - - temp_adc Gets the ADC temperature (int) + - temp_adc Gets the ADC temperature. \c Returns \c EIGER,JUNGFRAU(double"°C") Others \c (int"°C") */ descrToFuncMap[i].m_pFuncName="temp_adc"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdADC; i++; /*! \page settings - - temp_fpga Gets the FPGA temperature (int) + - temp_fpga Gets the FPGA temperature. \c Returns \c EIGER,JUNGFRAU(double"°C") Others \c (int"°C") */ descrToFuncMap[i].m_pFuncName="temp_fpga"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdADC; i++; /*! \page settings - - temp_fpgaext Gets the external FPGA temperature (int) + - temp_fpgaext Gets the external FPGA temperature. Used in EIGER only. \c Returns \c EIGER(double"°C") */ descrToFuncMap[i].m_pFuncName="temp_fpgaext"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdADC; i++; /*! \page settings - - temp_10ge Gets the 10Gbe temperature (int) + - temp_10ge Gets the 10Gbe temperature. Used in EIGER only. \c Returns \c EIGER(double"°C") */ descrToFuncMap[i].m_pFuncName="temp_10ge"; // - descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdADC; + descrToFuncMap[i].m_pFuncPtr. \c Returns \c (int ["mV"])etectorCommand::cmdADC; i++; /*! \page settings - - temp_dcdc Gets the temperature of the DC/DC converter(int) + - temp_dcdc Gets the temperature of the DC/DC converter. Used in EIGER only. \c Returns \c EIGER(double"°C") */ descrToFuncMap[i].m_pFuncName="temp_dcdc"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdADC; i++; /*! \page settings - - temp_sodl Gets the temperature of the left so-dimm memory (int) + - temp_sodl Gets the temperature of the left so-dimm memory . Used in EIGER only. \c Returns \c EIGER(double"°C") */ descrToFuncMap[i].m_pFuncName="temp_sodl"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdADC; i++; /*! \page settings - - temp_sodr Gets the temperature of the right so-dimm memory (int) + - temp_sodr Gets the temperature of the right so-dimm memory. Used in EIGER only. \c Returns \c EIGER(double"°C") */ descrToFuncMap[i].m_pFuncName="temp_sodr"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdADC; @@ -1474,21 +1477,21 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) { /*! \page settings - - adc:j Gets the values of the slow ADC number j for the new chiptest board (int) + - adc:j Gets the values of the slow ADC number j for the new chiptest board. \c Returns \c (int"°C") */ descrToFuncMap[i].m_pFuncName="adc"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdADC; i++; /*! \page settings - - temp_fpgal Gets the temperature of the left frontend FPGA (int) + - temp_fpgal Gets the temperature of the left frontend FPGA. Used in EIGER only. \c Returns \c EIGER(double"°C") */ descrToFuncMap[i].m_pFuncName="temp_fpgafl"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdADC; i++; /*! \page settings - - temp_fpgar Gets the temperature of the right frontend FPGA (int) + - temp_fpgar Gets the temperature of the right frontend FPGA. Used in EIGER only. \c Returns \c EIGER(double"°C") */ descrToFuncMap[i].m_pFuncName="temp_fpgafr"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdADC; @@ -1496,70 +1499,70 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) { /*! \page settings - - i_a Gets the current of the power supply a on the new chiptest board (int) + - i_a Gets the current of the power supply a on the new chiptest board. \c Returns \c (int"mV") */ descrToFuncMap[i].m_pFuncName="i_a"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdADC; i++; /*! \page settings - - i_b Gets the current of the power supply b on the new chiptest board (int) + - i_b Gets the current of the power supply b on the new chiptest board \c Returns \c (int"mV") */ descrToFuncMap[i].m_pFuncName="i_b"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdADC; i++; /*! \page settings - - i_c Gets the current of the power supply c on the new chiptest board (int) + - i_c Gets the current of the power supply c on the new chiptest board \c Returns \c (int"mV") */ descrToFuncMap[i].m_pFuncName="i_c"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdADC; i++; /*! \page settings - - i_d Gets the current of the power supply d on the new chiptest board (int) + - i_d Gets the current of the power supply d on the new chiptest board \c Returns \c (int"mV") */ descrToFuncMap[i].m_pFuncName="i_d"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdADC; i++; /*! \page settings - - i_io Gets the current of the power supply io on the new chiptest board (int) + - i_io Gets the current of the power supply io on the new chiptest board \c Returns \c (int"mV") */ descrToFuncMap[i].m_pFuncName="i_io"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdADC; i++; /*! \page settings - - vm_a Gets the measured voltage of the power supply a on the new chiptest board (int) + - vm_a Gets the measured voltage of the power supply a on the new chiptest board \c Returns \c (int"mV") */ descrToFuncMap[i].m_pFuncName="vm_a"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdADC; i++; /*! \page settings - - vm_b Gets the measured voltage of the power supply b on the new chiptest board (int) + - vm_b Gets the measured voltage of the power supply b on the new chiptest board \c Returns \c (int"mV") */ descrToFuncMap[i].m_pFuncName="vm_b"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdADC; i++; /*! \page settings - - vm_c Gets the measured voltage of the power supply c on the new chiptest board (int) + - vm_c Gets the measured voltage of the power supply c on the new chiptest board \c Returns \c (int"mV") */ descrToFuncMap[i].m_pFuncName="vm_c"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdADC; i++; /*! \page settings - - vm_d Gets the measured voltage of the power supply d on the new chiptest board (int) + - vm_d Gets the measured voltage of the power supply d on the new chiptest board \c Returns \c (int"mV") */ descrToFuncMap[i].m_pFuncName="vm_d"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdADC; i++; /*! \page settings - - vm_io Gets the measured voltage of the power supply io on the new chiptest board (int) + - vm_io Gets the measured voltage of the power supply io on the new chiptest board \c Returns \c (int"mV") */ descrToFuncMap[i].m_pFuncName="vm_io"; // descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdADC; @@ -3184,7 +3187,7 @@ string slsDetectorCommand::cmdRateCorr(int narg, char *args[], int action){ if (myDet->getRateCorrection(t)) { sprintf(answer,"%0.9f",t); } else { - sprintf(answer,"%f",0.); + sprintf(answer,"%0.9f",0.); } return string(answer); } @@ -5206,7 +5209,7 @@ string slsDetectorCommand::cmdADC(int narg, char *args[], int action) { sprintf(answer,"%f",myDet->getADC(adc)); #endif //if ((adc == TEMPERATURE_ADC) || (adc == TEMPERATURE_FPGA)) - if (adc<1000) + if (adc<=100) strcat(answer,"°C"); else strcat(answer,"mV"); @@ -5325,9 +5328,6 @@ string slsDetectorCommand::cmdTimer(int narg, char *args[], int action) { myDet->setReceiverOnline(ONLINE_FLAG); ret=myDet->setTimer(index,t); - if ((ret!=-1) && (index==ACQUISITION_TIME || index==SUBFRAME_ACQUISITION_TIME || index==FRAME_PERIOD || index==DELAY_AFTER_TRIGGER)) - rval=(double)ret*1E-9; - else rval=ret; // cout << "here!"<< endl; //set frame index @@ -5338,10 +5338,13 @@ string slsDetectorCommand::cmdTimer(int narg, char *args[], int action) { myDet->setFrameIndex(-1); } - if (index==FRAME_NUMBER || index==GATES_NUMBER || index==PROBES_NUMBER || index==CYCLES_NUMBER || index==MEASUREMENTS_NUMBER) - sprintf(answer,"%d",(int)rval); - else + if ((ret!=-1) && (index==ACQUISITION_TIME || index==SUBFRAME_ACQUISITION_TIME || index==FRAME_PERIOD || index==DELAY_AFTER_TRIGGER)) { + rval=(double)ret*1E-9; sprintf(answer,"%0.9f",rval); + } + else + sprintf(answer,"%lld",(long long int)ret); + return string(answer); @@ -6634,7 +6637,7 @@ string slsDetectorCommand::cmdPulse(int narg, char *args[], int action) { if(retval == OK) return string(" successful"); else - return string(" failed"); + return string(" unsuccessful"); }