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

change in user functions

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-09-21 11:16:29 +02:00
parent 18f014fd9e
commit 7e37a1da4b
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp
View File

@ -375,15 +375,15 @@ int slsDetectorUsers::setAllTrimbits(int val) {
}
int slsDetectorUsers::setDAC(int id, int dacindex, int val) {
int slsDetectorUsers::setDAC(int dacindex, int val, int id) {
return myDetector->setDACValue(val, dacindex, id);
}
int slsDetectorUsers::getADC(int id, int adcindex) {
int slsDetectorUsers::getADC(int adcindex, int id) {
return myDetector->getADCValue(adcindex, id);
}
int slsDetectorUsers::stopReceiver() {
int slsDetectorUsers::startReceiver() {
return myDetector->startReceiver();
}

14
slsDetectorSoftware/slsDetector/slsDetectorUsers.h
View File

@ -622,20 +622,20 @@ class slsDetectorUsers
/**
@short set dac value
\param id module index (-1 for all)
\param dacindex dac index \sa dacIndex
\param val value to be set (-1 gets)
\param id module index (-1 for all)
\returns dac value
*/
int setDAC(int id, int dacindex, int val);
int setDAC(int dacindex, int val, int id = -1);
/**
@short get adc value
\param id module index (-1 for all)
\param adcindex adc index \sa dacIndex
\param id module index (-1 for all)
\returns adc value
*/
int getADC(int id, int adcindex);
int getADC(int adcindex, int id = -1);
/**
@ -650,12 +650,6 @@ class slsDetectorUsers
*/
int stopReceiver();
/**
@short stop receiver listening mode
\param returns OK or FAIL
*/
int stopReceiver();
/**
start detector acquisition in non blocking mode
\returns OK if all detectors are properly started, FAIL otherwise