diff --git a/slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp b/slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp index 86dbf0c09..515191384 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp @@ -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(); } diff --git a/slsDetectorSoftware/slsDetector/slsDetectorUsers.h b/slsDetectorSoftware/slsDetector/slsDetectorUsers.h index 9984515e4..33b82d121 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorUsers.h +++ b/slsDetectorSoftware/slsDetector/slsDetectorUsers.h @@ -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