mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-06-23 18:17:59 +02:00
merge conflict removed, jungfrau server and eiger server re compiled
This commit is contained in:
@ -568,6 +568,12 @@ class slsDetector : public slsDetectorUtils, public energyConversion {
|
||||
*/
|
||||
int powerChip(int ival= -1);
|
||||
|
||||
/** automatic comparator disable for Jungfrau only
|
||||
\param ival on is 1, off is 0, -1 to get
|
||||
\returns OK or FAIL
|
||||
*/
|
||||
int setAutoComparatorDisableMode(int ival= -1);
|
||||
|
||||
|
||||
/** loads the modules settings/trimbits reading from a file
|
||||
\param fname file name . If not specified, extension is automatically generated!
|
||||
@ -944,7 +950,31 @@ class slsDetector : public slsDetectorUtils, public energyConversion {
|
||||
\returns current ADC value (temperature for eiger and jungfrau in millidegrees)
|
||||
*/
|
||||
dacs_t getADC(dacIndex index, int imod=0);
|
||||
|
||||
/**
|
||||
set/gets threshold temperature (Jungfrau only)
|
||||
\param val value in millidegrees, -1 gets
|
||||
\param imod module number, -1 is all
|
||||
\returns threshold temperature in millidegrees
|
||||
*/
|
||||
int setThresholdTemperature(int val=-1, int imod=-1);
|
||||
|
||||
/**
|
||||
enables/disables temperature control (Jungfrau only)
|
||||
\param val value, -1 gets
|
||||
\param imod module number, -1 is all
|
||||
\returns temperature control enable
|
||||
*/
|
||||
int setTemperatureControl(int val=-1, int imod=-1);
|
||||
|
||||
/**
|
||||
Resets/ gets over-temperature event (Jungfrau only)
|
||||
\param val value, -1 gets
|
||||
\param imod module number, -1 is all
|
||||
\returns over-temperature event
|
||||
*/
|
||||
int setTemperatureEvent(int val=-1, int imod=-1);
|
||||
|
||||
/**
|
||||
configure channel
|
||||
\param reg channel register
|
||||
|
Reference in New Issue
Block a user