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

Update slsDetectorCommand.cpp

Browse Source 
help comments for the mythen3 dacs (not complete yet)
This commit is contained in:
Marie Andrä 2019-10-07 13:44:41 +02:00 committed by GitHub
parent 7a66dd08a3
commit 6cda61a612
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
slsDetectorSoftware/src/slsDetectorCommand.cpp
View File

@ -935,7 +935,7 @@ slsDetectorCommand::slsDetectorCommand(multiSlsDetector *det) {
++i; ++i;
/*! \page settings /*! \page settings
- <b>vhaper1 [i] [mv]</b> 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"]) - <b>vhaper [i] [mv]</b> Sets/gets the voltage to define the feedback resistance of the 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 = "vshaper"; descrToFuncMap[i].m_pFuncName = "vshaper";
descrToFuncMap[i].m_pFuncPtr = &slsDetectorCommand::cmdDAC; descrToFuncMap[i].m_pFuncPtr = &slsDetectorCommand::cmdDAC;
@ -949,7 +949,7 @@ slsDetectorCommand::slsDetectorCommand(multiSlsDetector *det) {
++i; ++i;
/*! \page settings /*! \page settings
- <b>vhaper1 [i] [mv]</b> 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"]) - <b>vhaperneg [i] [mv]</b> Sets/gets the voltage to define the feedback resistance of the negative-polarity 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 = "vshaperneg"; descrToFuncMap[i].m_pFuncName = "vshaperneg";
descrToFuncMap[i].m_pFuncPtr = &slsDetectorCommand::cmdDAC; descrToFuncMap[i].m_pFuncPtr = &slsDetectorCommand::cmdDAC;
@ -1229,110 +1229,96 @@ slsDetectorCommand::slsDetectorCommand(multiSlsDetector *det) {
++i; ++i;
/*! \page settings /*! \page settings
- <b>vIpre</b> Sets/gets dac for xxx for Mythen3. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"]) - <b>vipre</b> Sets/gets dac for the current in the preamplifier for Mythen3. 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 = "vipre"; descrToFuncMap[i].m_pFuncName = "vipre";
descrToFuncMap[i].m_pFuncPtr = &slsDetectorCommand::cmdDAC; descrToFuncMap[i].m_pFuncPtr = &slsDetectorCommand::cmdDAC;
++i; ++i;
/*! \page settings /*! \page settings
- <b>vIpre</b> Sets/gets dac for xxx for Mythen3. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"]) - <b>vdcsh</b> Sets/gets dac for the baseline of the shaper for Mythen3. 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 = "vdcsh"; descrToFuncMap[i].m_pFuncName = "vdcsh";
descrToFuncMap[i].m_pFuncPtr = &slsDetectorCommand::cmdDAC; descrToFuncMap[i].m_pFuncPtr = &slsDetectorCommand::cmdDAC;
++i; ++i;
/*! \page settings /*! \page settings
- <b>Vth1</b> Sets/gets first detector threshold voltage for Mythen 3.01. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"]) - <b>vth1</b> Sets/gets first detector threshold voltage for Mythen 3. 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 = "vth1"; descrToFuncMap[i].m_pFuncName = "vth1";
descrToFuncMap[i].m_pFuncPtr = &slsDetectorCommand::cmdDAC; descrToFuncMap[i].m_pFuncPtr = &slsDetectorCommand::cmdDAC;
++i; ++i;
/*! \page settings /*! \page settings
- <b>Vth1</b> Sets/gets second detector threshold voltage for Mythen 3.0. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"]) - <b>vth2</b> Sets/gets second detector threshold voltage for Mythen 3. 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 = "vth2"; descrToFuncMap[i].m_pFuncName = "vth2";
descrToFuncMap[i].m_pFuncPtr = &slsDetectorCommand::cmdDAC; descrToFuncMap[i].m_pFuncPtr = &slsDetectorCommand::cmdDAC;
++i; ++i;
/*! \page settings /*! \page settings
- <b>Vth1</b> Sets/gets third detector threshold voltage for Mythen 3.0. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"]) - <b>vth3</b> Sets/gets third detector threshold voltage for Mythen 3. 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 = "vth3"; descrToFuncMap[i].m_pFuncName = "vth3";
descrToFuncMap[i].m_pFuncPtr = &slsDetectorCommand::cmdDAC; descrToFuncMap[i].m_pFuncPtr = &slsDetectorCommand::cmdDAC;
++i; ++i;
/*! \page settings /*! \page settings
- <b>vIpre</b> Sets/gets dac for xxx for Mythen3. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"]) - <b>vpl</b> Sets/gets dac for the lower value of the analog pulse for Mythen3. 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 = "vpl"; descrToFuncMap[i].m_pFuncName = "vpl";
descrToFuncMap[i].m_pFuncPtr = &slsDetectorCommand::cmdDAC; descrToFuncMap[i].m_pFuncPtr = &slsDetectorCommand::cmdDAC;
++i; ++i;
/*! \page settings /*! \page settings
- <b>vIpre</b> Sets/gets dac for xxx for Mythen3. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"]) - <b>vph</b> Sets/gets dac for the higher value of the analog pulse for Mythen3. 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 = "vph"; descrToFuncMap[i].m_pFuncName = "vph";
descrToFuncMap[i].m_pFuncPtr = &slsDetectorCommand::cmdDAC; descrToFuncMap[i].m_pFuncPtr = &slsDetectorCommand::cmdDAC;
++i; ++i;
/*! \page settings /*! \page settings
- <b>vIpre</b> Sets/gets dac for xxx for Mythen3. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"]) - <b>vtrim</b> Sets/gets dac for the voltage defining the trim bit size for Mythen3. 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 = "vtrim"; descrToFuncMap[i].m_pFuncName = "vtrim";
descrToFuncMap[i].m_pFuncPtr = &slsDetectorCommand::cmdDAC; descrToFuncMap[i].m_pFuncPtr = &slsDetectorCommand::cmdDAC;
++i; ++i;
/*! \page settings /*! \page settings
- <b>vIpre</b> Sets/gets dac for xxx for Mythen3. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"]) - <b>viinsh</b> Sets/gets dac for xxx for Mythen3. 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 = "viinsh"; descrToFuncMap[i].m_pFuncName = "viinsh";
descrToFuncMap[i].m_pFuncPtr = &slsDetectorCommand::cmdDAC; descrToFuncMap[i].m_pFuncPtr = &slsDetectorCommand::cmdDAC;
++i; ++i;
/*! \page settings /*! \page settings
- <b>vIpre</b> Sets/gets dac for xxx for Mythen3. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"]) - <b>cas</b> Sets/gets dac for xxx for Mythen3. 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 = "cas"; descrToFuncMap[i].m_pFuncName = "cas";
descrToFuncMap[i].m_pFuncPtr = &slsDetectorCommand::cmdDAC; descrToFuncMap[i].m_pFuncPtr = &slsDetectorCommand::cmdDAC;
++i; ++i;
/*! \page settings /*! \page settings
- <b>vIpre</b> Sets/gets dac for xxx for Mythen3. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"]) - <b>cassh</b> Sets/gets dac for xxx for Mythen3. 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 = "cassh"; descrToFuncMap[i].m_pFuncName = "cassh";
descrToFuncMap[i].m_pFuncPtr = &slsDetectorCommand::cmdDAC; descrToFuncMap[i].m_pFuncPtr = &slsDetectorCommand::cmdDAC;
++i; ++i;
/*! \page settings /*! \page settings
- <b>vIpre</b> Sets/gets dac for xxx for Mythen3. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"]) - <b>vicin</b> Sets/gets dac for the bias of the comparator for Mythen3. 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 = "vicin"; descrToFuncMap[i].m_pFuncName = "vicin";
descrToFuncMap[i].m_pFuncPtr = &slsDetectorCommand::cmdDAC; descrToFuncMap[i].m_pFuncPtr = &slsDetectorCommand::cmdDAC;
++i; ++i;
/*! \page settings /*! \page settings
- <b>vIpre</b> Sets/gets dac for xxx for Mythen3. Normally in DAC units unless \c mv is specified at the end of the command line. \c Returns \c (int ["mV"]) - <b>vipreout</b> Sets/gets dac for xxx for Mythen3. 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 = "vipreout"; descrToFuncMap[i].m_pFuncName = "vipreout";
descrToFuncMap[i].m_pFuncPtr = &slsDetectorCommand::cmdDAC; descrToFuncMap[i].m_pFuncPtr = &slsDetectorCommand::cmdDAC;
++i; ++i;
/*! \page settings
- <b>vIpre</b> Sets/gets dac for xxx for Mythen3. 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 = "vrfsh";
descrToFuncMap[i].m_pFuncPtr = &slsDetectorCommand::cmdDAC;
++i;
/*! \page settings
- <b>vIpre</b> Sets/gets dac for xxx for Mythen3. 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 = "vrfshnpol";
descrToFuncMap[i].m_pFuncPtr = &slsDetectorCommand::cmdDAC;
++i;
/* r/w timers */ /* r/w timers */
/*! \page settings /*! \page settings
\section settingsadcs ADCs \section settingsadcs ADCs
@ -1957,7 +1943,7 @@ std::string slsDetectorCommand::executeLine(int narg, const char * const args[],
if (action == READOUT_ACTION) if (action == READOUT_ACTION)
return cmdAcquire(narg, args, action, detPos); return cmdAcquire(narg, args, action, detPos);
xxx
size_t s = std::string(args[0]).find(':'); size_t s = std::string(args[0]).find(':');
std::string key = std::string(args[0]).substr(0, s); // truncate at : std::string key = std::string(args[0]).substr(0, s); // truncate at :