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

fixed part of mythen module 6 problem: offsets should be updated after set nmod, still need to fix numchips in one direction

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@542 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2013-05-06 16:23:13 +00:00
parent 1ed4017988
commit f0e30926fe
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
View File

@ -1957,12 +1957,12 @@ while(read_frame(file_des)==OK) {
#ifdef VERBOSE
printf("frame read\n");
#endif
#endif
;
}
#ifdef VERBOSE
printf("Frames finished\n");
#endif
#endif
return OK;

2
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -3533,6 +3533,8 @@ int multiSlsDetector::setNumberOfModules(int p, dimension d) {
thisMultiDetector->numberOfChannels+=detectors[idet]->getTotalNumberOfChannels();
}
}
updateOffsets();
return ret;
}

2
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@ -591,7 +591,7 @@ class slsDetector : public slsDetectorUtils, public energyConversion {
int getTotalNumberOfChannels(){return thisDetector->nChans*thisDetector->nChips*thisDetector->nMods;};
int getTotalNumberOfChannels(dimension d){return thisDetector->nChan[d]*thisDetector->nChips*thisDetector->nMod[X];};
int getTotalNumberOfChannels(dimension d){return thisDetector->nChan[d]*thisDetector->nChips*thisDetector->nMod[d];};
int getMaxNumberOfChannels(){return thisDetector->nChans*thisDetector->nChips*thisDetector->nModsMax;};