mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-04-29 09:30:02 +02:00
added high voltage to users class
This commit is contained in:
parent
ef257d12e7
commit
4903164f95
@ -404,7 +404,12 @@ class slsDetectorBase : public virtual slsDetectorDefs, public virtual errorDef
|
|||||||
default: setReadOutFlags(SAFE);break; \
|
default: setReadOutFlags(SAFE);break; \
|
||||||
} \
|
} \
|
||||||
} \
|
} \
|
||||||
}; \
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
get readout mode of detector (eiger specific)
|
||||||
|
\returns 0 for nonparallel, 1 for parallel, 2 for safe
|
||||||
|
*/
|
||||||
int getParallelMode(){ \
|
int getParallelMode(){ \
|
||||||
int ret = setReadOutFlags(); \
|
int ret = setReadOutFlags(); \
|
||||||
if (ret&NONPARALLEL) return 0; \
|
if (ret&NONPARALLEL) return 0; \
|
||||||
@ -413,11 +418,17 @@ class slsDetectorBase : public virtual slsDetectorDefs, public virtual errorDef
|
|||||||
return -1; \
|
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
|
set dacs value
|
||||||
\param val value (in V)
|
\param val value
|
||||||
\param index DAC index
|
\param index DAC index
|
||||||
\param mV 0 in dac units or 1 in mV
|
\param mV 0 in dac units or 1 in mV
|
||||||
\param imod module number (if -1 alla modules)
|
\param imod module number (if -1 alla modules)
|
||||||
|
@ -354,3 +354,7 @@ int slsDetectorUsers::stopAcquisition() {
|
|||||||
int slsDetectorUsers::setReceiverSilentMode(int i) {
|
int slsDetectorUsers::setReceiverSilentMode(int i) {
|
||||||
return myDetector->setReceiverSilentMode(i);
|
return myDetector->setReceiverSilentMode(i);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int slsDetectorUsers::setHighVoltage(int i) {
|
||||||
|
return myDetector->setHighVoltage(i);
|
||||||
|
}
|
||||||
|
@ -618,6 +618,13 @@ class slsDetectorUsers
|
|||||||
*/
|
*/
|
||||||
int setReceiverSilentMode(int i);
|
int setReceiverSilentMode(int i);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* set high voltage
|
||||||
|
* @param i > 0 sets, 0 unsets, (-1 gets)
|
||||||
|
* @return high voltage
|
||||||
|
*/
|
||||||
|
int setHighVoltage(int i);
|
||||||
|
|
||||||
/************************************************************************
|
/************************************************************************
|
||||||
|
|
||||||
STATIC FUNCTIONS
|
STATIC FUNCTIONS
|
||||||
|
Loading…
x
Reference in New Issue
Block a user