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

added high voltage to users class

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-11-14 10:58:54 +01:00
parent ef257d12e7
commit 4903164f95
3 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
slsDetectorSoftware/slsDetector/slsDetectorBase.h
View File

@ -404,7 +404,12 @@ class slsDetectorBase : public virtual slsDetectorDefs, public virtual errorDef
default: setReadOutFlags(SAFE);break; \
} \
} \
}; \
};
/**
get readout mode of detector (eiger specific)
\returns 0 for nonparallel, 1 for parallel, 2 for safe
*/
int getParallelMode(){ \
int ret = setReadOutFlags(); \
if (ret&NONPARALLEL) return 0; \
@ -413,11 +418,17 @@ class slsDetectorBase : public virtual slsDetectorDefs, public virtual errorDef
return -1; \
} \
/**
set/ get high voltage
\param val high voltage (>0 sets, 0 unsets, -1 gets)
\returns high voltage
*/
int setHighVoltage(int val){return setDAC(val, HV_NEW, 0, -1);} \
/**
set dacs value
\param val value (in V)
\param val value
\param index DAC index
\param mV 0 in dac units or 1 in mV
\param imod module number (if -1 alla modules)

4
slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp
View File

@ -354,3 +354,7 @@ int slsDetectorUsers::stopAcquisition() {
int slsDetectorUsers::setReceiverSilentMode(int i) {
return myDetector->setReceiverSilentMode(i);
}
int slsDetectorUsers::setHighVoltage(int i) {
return myDetector->setHighVoltage(i);
}

7
slsDetectorSoftware/slsDetector/slsDetectorUsers.h
View File

@ -618,6 +618,13 @@ class slsDetectorUsers
*/
int setReceiverSilentMode(int i);
/**
* set high voltage
* @param i > 0 sets, 0 unsets, (-1 gets)
* @return high voltage
*/
int setHighVoltage(int i);
/************************************************************************
STATIC FUNCTIONS