detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-22 03:40:04 +02:00
Code Issues Actions Packages Releases Activity

temp_adc not in eiger for usersclass (esrf). get adc in millicelsius

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-09-21 14:51:32 +02:00
parent 5873b5c9a8
commit 7134d0d0ed
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
slsDetectorSoftware/slsDetector/slsDetectorBase.h
View File

@ -424,7 +424,7 @@ class slsDetectorBase : public virtual slsDetectorDefs, public virtual errorDef
\returns current DAC value \returns current DAC value
*/ */
virtual dacs_t setDAC(dacs_t val, dacIndex index , int mV, int imod=-1)=0; 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 @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 \param s can be 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, \returns TEMPERATURE_FPGA, TEMPERATURE_FPGAEXT, TEMPERATURE_10GE, TEMPERATURE_DCDC, TEMPERATURE_SODL,
TEMPERATURE_SODR, TEMPERATURE_FPGA2, TEMPERATURE_FPGA3, -1 when unknown mode TEMPERATURE_SODR, TEMPERATURE_FPGA2, TEMPERATURE_FPGA3, -1 when unknown mode
*/ */
static int getADCIndex(string s){ static int getADCIndex(string s){
if (s=="temp_adc") return TEMPERATURE_ADC;
if (s=="temp_fpga") return TEMPERATURE_FPGA; if (s=="temp_fpga") return TEMPERATURE_FPGA;
if (s=="temp_fpgaext") return TEMPERATURE_FPGAEXT; if (s=="temp_fpgaext") return TEMPERATURE_FPGAEXT;
if (s=="temp_10ge") return TEMPERATURE_10GE; if (s=="temp_10ge") return TEMPERATURE_10GE;

4
slsDetectorSoftware/slsDetector/slsDetectorUsers.h
View File

@ -579,9 +579,9 @@ class slsDetectorUsers
/** /**
@short get adc value @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) \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); int getADC(string adc, int id = -1);