From 6cda61a612bdf79d65541bbff14a867f2c0aa0e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marie=20Andr=C3=A4?= <33870994+MarieAndrae@users.noreply.github.com> Date: Mon, 7 Oct 2019 13:44:41 +0200 Subject: [PATCH] Update slsDetectorCommand.cpp help comments for the mythen3 dacs (not complete yet) --- .../src/slsDetectorCommand.cpp | 46 +++++++------------ 1 file changed, 16 insertions(+), 30 deletions(-) diff --git a/slsDetectorSoftware/src/slsDetectorCommand.cpp b/slsDetectorSoftware/src/slsDetectorCommand.cpp index 9a7f23f31..e9096aa61 100755 --- a/slsDetectorSoftware/src/slsDetectorCommand.cpp +++ b/slsDetectorSoftware/src/slsDetectorCommand.cpp @@ -935,7 +935,7 @@ slsDetectorCommand::slsDetectorCommand(multiSlsDetector *det) { ++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. \c Returns \c (int ["mV"]) + - vhaper [i] [mv] 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_pFuncPtr = &slsDetectorCommand::cmdDAC; @@ -949,7 +949,7 @@ slsDetectorCommand::slsDetectorCommand(multiSlsDetector *det) { ++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. \c Returns \c (int ["mV"]) + - vhaperneg [i] [mv] 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_pFuncPtr = &slsDetectorCommand::cmdDAC; @@ -1229,110 +1229,96 @@ slsDetectorCommand::slsDetectorCommand(multiSlsDetector *det) { ++i; /*! \page settings - - vIpre 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"]) + - vipre 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_pFuncPtr = &slsDetectorCommand::cmdDAC; ++i; /*! \page settings - - vIpre 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"]) + - vdcsh 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_pFuncPtr = &slsDetectorCommand::cmdDAC; ++i; /*! \page settings - - Vth1 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"]) + - vth1 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_pFuncPtr = &slsDetectorCommand::cmdDAC; ++i; /*! \page settings - - Vth1 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"]) + - vth2 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_pFuncPtr = &slsDetectorCommand::cmdDAC; ++i; /*! \page settings - - Vth1 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"]) + - vth3 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_pFuncPtr = &slsDetectorCommand::cmdDAC; ++i; /*! \page settings - - vIpre 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"]) + - vpl 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_pFuncPtr = &slsDetectorCommand::cmdDAC; ++i; /*! \page settings - - vIpre 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"]) + - vph 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_pFuncPtr = &slsDetectorCommand::cmdDAC; ++i; /*! \page settings - - vIpre 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"]) + - vtrim 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_pFuncPtr = &slsDetectorCommand::cmdDAC; ++i; /*! \page settings - - vIpre 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"]) + - viinsh 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_pFuncPtr = &slsDetectorCommand::cmdDAC; ++i; /*! \page settings - - vIpre 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"]) + - cas 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_pFuncPtr = &slsDetectorCommand::cmdDAC; ++i; /*! \page settings - - vIpre 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"]) + - cassh 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_pFuncPtr = &slsDetectorCommand::cmdDAC; ++i; /*! \page settings - - vIpre 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"]) + - vicin 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_pFuncPtr = &slsDetectorCommand::cmdDAC; ++i; /*! \page settings - - vIpre 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"]) + - vipreout 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_pFuncPtr = &slsDetectorCommand::cmdDAC; ++i; - /*! \page settings - - vIpre 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 - - vIpre 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 */ /*! \page settings \section settingsadcs ADCs @@ -1957,7 +1943,7 @@ std::string slsDetectorCommand::executeLine(int narg, const char * const args[], if (action == READOUT_ACTION) return cmdAcquire(narg, args, action, detPos); - +xxx size_t s = std::string(args[0]).find(':'); std::string key = std::string(args[0]).substr(0, s); // truncate at :