changes to users class to call dac and adc by string name

This commit is contained in:
Dhanya Maliakal
2017-09-21 12:54:03 +02:00
parent f2be03be05
commit 271664f577
3 changed files with 58 additions and 132 deletions

View File

@ -553,67 +553,16 @@ class slsDetectorUsers
*/
int setClockDivider(int value);
/**
@short gets continuous readout flag
\returns gets continuous readout flag
*/
int getContinuousReadoutFlag();
/**
@short sets continuous readout flag
\returns OK if successful, else false
*/
void setContinuousReadoutFlag();
/**
@short gets store in ram readout flag
\returns gets store in ram readout flag
/**
@short sets parallel mode
\param value 0 for non parallel, 1 for parallel, 2 for safe mode (-1 gets)
\returns gets parallel mode
*/
int getStoreInRamReadoutFlag();
int setParallelMode(int value);
/**
@short sets store in ram readout flag
\returns OK if successful, else false
*/
void setStoreInRamReadoutFlag();
/**
@short gets parallel readout flag
\returns gets parallel readout flag
*/
int getParallelReadoutFlag();
/**
@short sets parallel readout flag
\returns OK if successful, else false
*/
void setParallelReadoutFlag();
/**
@short gets non parallel readout flag
\returns gets non parallel readout flag
*/
int getNonParallelReadoutFlag();
/**
@short sets non parallel readout flag
\returns OK if successful, else false
*/
void setNonParallelReadoutFlag();
/**
@short gets safe readout flag
\returns gets safe readout flag
*/
int getSafeReadoutFlag();
/**
@short sets safe readout flag
\returns OK if successful, else false
*/
void setSafeReadoutFlag();
/**
/**
@short sets all trimbits to value (only available for eiger)
\param val value to be set (-1 gets)
\param id module index (-1 for all)
@ -623,19 +572,18 @@ class slsDetectorUsers
/**
@short set dac value
\param dacindex dac index \sa dacIndex
\param dac dac as string. can be vcmp_ll, vcmp_lr, vcmp_rl, vcmp_rr, vthreshold, vrf, vrs, vtr, vcall, vcp. others not supported
\param val value to be set (-1 gets)
\param id module index (-1 for all)
\returns dac value
\returns dac value or -1 (if id=-1 & dac value is different for all modules) or -9999 if dac string does not match
*/
int setDAC(int dacindex, int val, int id = -1);
int setDAC(string dac, int val, int id = -1);
/**
@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,
i_a, i_b, i_c, i_d, vm_a, vm_b,vm_c, vm_d, vm_io, i_io
\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 id module index (-1 for all)
\returns adc value, -1 (if id=-1,adcvalue is different for all modules), -9999 if adc string does not match
\returns adc value 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);