From 7a66dd08a3d16122fbf744875dbaf64ed66d3e00 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Mon, 7 Oct 2019 12:30:28 +0200 Subject: [PATCH] help for dacs mythen3 --- .../src/slsDetectorCommand.cpp | 41 +++++++++++++++++-- 1 file changed, 37 insertions(+), 4 deletions(-) diff --git a/slsDetectorSoftware/src/slsDetectorCommand.cpp b/slsDetectorSoftware/src/slsDetectorCommand.cpp index 4ef4e569e..9a7f23f31 100755 --- a/slsDetectorSoftware/src/slsDetectorCommand.cpp +++ b/slsDetectorSoftware/src/slsDetectorCommand.cpp @@ -1228,13 +1228,16 @@ slsDetectorCommand::slsDetectorCommand(multiSlsDetector *det) { descrToFuncMap[i].m_pFuncPtr = &slsDetectorCommand::cmdDAC; ++i; - /* MYTHEN 3.0 - all values are in DACu */ - + /*! \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 = "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"]) + */ descrToFuncMap[i].m_pFuncName = "vdcsh"; descrToFuncMap[i].m_pFuncPtr = &slsDetectorCommand::cmdDAC; ++i; @@ -1260,42 +1263,72 @@ slsDetectorCommand::slsDetectorCommand(multiSlsDetector *det) { descrToFuncMap[i].m_pFuncPtr = &slsDetectorCommand::cmdDAC; ++i; - descrToFuncMap[i].m_pFuncName = "vpl"; //baseline for analog pulsing + /*! \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 = "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"]) + */ 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"]) + */ 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"]) + */ 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"]) + */ 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"]) + */ 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"]) + */ 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"]) + */ 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;