From 7134d0d0ed0722b2e849e4a4978e8fe2abb5f87d Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Thu, 21 Sep 2017 14:51:32 +0200 Subject: [PATCH] temp_adc not in eiger for usersclass (esrf). get adc in millicelsius --- slsDetectorSoftware/slsDetector/slsDetectorBase.h | 7 +++---- slsDetectorSoftware/slsDetector/slsDetectorUsers.h | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/slsDetectorSoftware/slsDetector/slsDetectorBase.h b/slsDetectorSoftware/slsDetector/slsDetectorBase.h index 63ff9c6ed..e72f512da 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorBase.h +++ b/slsDetectorSoftware/slsDetector/slsDetectorBase.h @@ -424,7 +424,7 @@ class slsDetectorBase : public virtual slsDetectorDefs, public virtual errorDef \returns current DAC value */ virtual dacs_t setDAC(dacs_t val, dacIndex index , int mV, int imod=-1)=0; - int setDACValue(int val, int index , int mV, int imod=-1) { return (int)setDAC((dacs_t)val,(dacIndex)index, mV,imod);}; + int setDACValue(int val, int index , int imod=-1) { return (int)setDAC((dacs_t)val,(dacIndex)index,0,imod);}; /** @@ -838,12 +838,11 @@ virtual void readFrameFromReceiver()=0; /** @short returns adc index from string - \param s can be temp_adc, temp_fpga, temp_fpgaext, temp_10ge, temp_dcdc, temp_sodl, temp_sodr, temp_fpgafl, temp_fpgafr - \returns TEMPERATURE_ADC, TEMPERATURE_FPGA, TEMPERATURE_FPGAEXT, TEMPERATURE_10GE, TEMPERATURE_DCDC, TEMPERATURE_SODL, + \param s can be temp_fpga, temp_fpgaext, temp_10ge, temp_dcdc, temp_sodl, temp_sodr, temp_fpgafl, temp_fpgafr + \returns TEMPERATURE_FPGA, TEMPERATURE_FPGAEXT, TEMPERATURE_10GE, TEMPERATURE_DCDC, TEMPERATURE_SODL, TEMPERATURE_SODR, TEMPERATURE_FPGA2, TEMPERATURE_FPGA3, -1 when unknown mode */ static int getADCIndex(string s){ - if (s=="temp_adc") return TEMPERATURE_ADC; if (s=="temp_fpga") return TEMPERATURE_FPGA; if (s=="temp_fpgaext") return TEMPERATURE_FPGAEXT; if (s=="temp_10ge") return TEMPERATURE_10GE; diff --git a/slsDetectorSoftware/slsDetector/slsDetectorUsers.h b/slsDetectorSoftware/slsDetector/slsDetectorUsers.h index cadb8a2a9..063658f64 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorUsers.h +++ b/slsDetectorSoftware/slsDetector/slsDetectorUsers.h @@ -579,9 +579,9 @@ class slsDetectorUsers /** @short get adc value - \param adc adc as string. can be temp_adc, temp_fpga, temp_fpgaext, temp_10ge, temp_dcdc, temp_sodl, temp_sodr, temp_fpgafl, temp_fpgafr. others not supported + \param adc adc as string. can be temp_fpga, temp_fpgaext, temp_10ge, temp_dcdc, temp_sodl, temp_sodr, temp_fpgafl, temp_fpgafr. others not supported \param id module index (-1 for all) - \returns adc value or -1 (if id=-1 & adc value is different for all modules) or -9999 if adc string does not match + \returns adc value in millidegree Celsius or -1 (if id=-1 & adc value is different for all modules) or -9999 if adc string does not match */ int getADC(string adc, int id = -1);