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

timing command added, several bugs concerning the synchronization of multiple detectors fixed

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@134 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
bergamaschi
2012-02-28 13:59:28 +00:00
parent b755c533f0
commit 5e086b9ee6
10 changed files with 241 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -557,15 +557,23 @@ int multiSlsDetector::setMaster(int i) {
int ret=-1, slave=0;
masterFlags f;
#ifdef VERBOSE
cout << "settin master in position " << i << endl;
#endif
if (i>=0 && i<thisMultiDetector->numberOfDetectors) {
if (detectors[i]) {
#ifdef VERBOSE
cout << "detector position " << i << " ";
#endif
thisMultiDetector->masterPosition=i;
detectors[i]->setMaster(IS_MASTER);
}
for (int id=0; id<thisMultiDetector->numberOfDetectors; id++) {
if (i!=id) {
if (detectors[id]) {
#ifdef VERBOSE
cout << "detector position " << id << " ";
#endif
detectors[id]->setMaster(IS_SLAVE);
}
}
@ -574,15 +582,22 @@ int multiSlsDetector::setMaster(int i) {
} else if (i==-2) {
for (int id=0; id<thisMultiDetector->numberOfDetectors; id++) {
if (detectors[id]) {
#ifdef VERBOSE
cout << "detector position " << id << " ";
#endif
detectors[id]->setMaster(NO_MASTER);
}
}
}
// check return value
for (int id=0; id<thisMultiDetector->numberOfDetectors; id++) {
if (detectors[id]) {
#ifdef VERBOSE
cout << "detector position " << id << " ";
#endif
f=detectors[id]->setMaster(GET_MASTER);
switch (f) {
case NO_MASTER:
@ -597,6 +612,7 @@ int multiSlsDetector::setMaster(int i) {
break;
case IS_SLAVE:
slave=1;
break;
default:
ret=-2;
}
@ -2832,6 +2848,7 @@ int multiSlsDetector::dumpDetectorSetup(string const fname, int level){
"frames",\
"cycles",\
"probes",\
"timing",\
"fineoff",\
"ratecorr",\
"startscript",\
@ -2858,7 +2875,7 @@ int multiSlsDetector::dumpDetectorSetup(string const fname, int level){
"badchannels",\
"angconv"
};
int nvar=38;
int nvar=39;