diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp index b9de27c64..1bca22309 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp @@ -1043,14 +1043,14 @@ slsDetectorDefs::detectorSettings multiSlsDetector::setSettings(detectorSettings -int multiSlsDetector::getChanRegs(double* retval){ +int multiSlsDetector::getChanRegs(double* retval,bool fromDetector){ //nChansDet and currentNumChans is because of varying channel size per detector int n = thisMultiDetector->numberOfChannels,nChansDet,currentNumChans=0; double retval1[n]; for (int idet=0; idetnumberOfDetectors; idet++) { if (detectors[idet]) { - nChansDet = detectors[idet]->getChanRegs(retval1); + nChansDet = detectors[idet]->getChanRegs(retval1,fromDetector); memcpy(retval + (currentNumChans * sizeof(double)), retval1 , nChansDet*sizeof(double)); currentNumChans += nChansDet; diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h index 49473d3b0..951a1383b 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h @@ -430,9 +430,10 @@ class multiSlsDetector : public slsDetectorUtils { /** Returns the trimbits from the detector's shared memmory \param retval is the array with the trimbits + \param fromDetector is true if the trimbits shared memory have to be uploaded from detector \returns the total number of channels for the detector */ - int getChanRegs(double* retval); + int getChanRegs(double* retval,bool fromDetector); diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp index 484bb7c07..92515b7a2 100644 --- a/slsDetectorSoftware/slsDetector/slsDetector.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp @@ -2438,7 +2438,7 @@ int slsDetector::setModule(sls_detector_module module){ }; slsDetectorDefs::sls_detector_module *slsDetector::getModule(int imod){ -cout<<"getModuke:"<