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

solevd bug on trimbit retrieving

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@718 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
x04sa
2014-01-28 10:17:46 +00:00
parent 154be62476
commit a7ad6b5b66
9 changed files with 93 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -1137,12 +1137,16 @@ int multiSlsDetector::getChanRegs(double* retval,bool fromDetector){
for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
if (detectors[idet]) {
// cout << "det " << idet << endl;
nChansDet = detectors[idet]->getChanRegs(retval1,fromDetector);
// cout << "returned" << endl;
if(detectors[idet]->getErrorMask())
setErrorMask(getErrorMask()|(1<<idet));
// cout << "memcopy "<< currentNumChans << " " << nChansDet << "(" << n << ")" << endl;
memcpy(retval + (currentNumChans * sizeof(double)), retval1 , nChansDet*sizeof(double));
memcpy(retval + (currentNumChans), retval1 , nChansDet*sizeof(double));
currentNumChans += nChansDet;
// cout << "Done" << endl;
}
}
return n;