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

set settings for eiger drafts

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@812 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2014-04-01 08:46:00 +00:00
parent 5ab4a88ec5
commit 83064243e1
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -3572,7 +3572,7 @@ int multiSlsDetector::decodeNMod(int i, int &id, int &im) {
#ifdef VERBOSE #ifdef VERBOSE
cout << " A---------" << id << " position " << im << endl; cout << " A---------" << id << " position " << im << endl;
#endif #endif
cout<<"decodeNMod:-1"<<endl;
return -1; return -1;
} }
int nm; int nm;
@ -3585,7 +3585,6 @@ cout<<"decodeNMod:-1"<<endl;
#ifdef VERBOSE #ifdef VERBOSE
cout << " B---------" <<id << " position " << im << endl; cout << " B---------" <<id << " position " << im << endl;
#endif #endif
cout<<"decodeNMod:"<<im<<endl;
return im; return im;
} else { } else {
i-=nm; i-=nm;
@ -3597,7 +3596,6 @@ cout<<"decodeNMod:-1"<<endl;
#ifdef VERBOSE #ifdef VERBOSE
cout <<" C---------" << id << " position " << im << endl; cout <<" C---------" << id << " position " << im << endl;
#endif #endif
cout<<"decodeNMod:-1"<<endl;
return -1; return -1;

8
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -2914,14 +2914,14 @@ slsDetectorDefs::detectorSettings slsDetector::setSettings( detectorSettings ise
} }
settingsfname=ostfn.str(); settingsfname=ostfn.str();
//#ifdef VERBOSE #ifdef VERBOSE
cout << "the settings file name is "<<settingsfname << endl; cout << "the settings file name is "<<settingsfname << endl;
//#endif #endif
if (readSettingsFile(settingsfname,thisDetector->myDetectorType, myMod)) { if (readSettingsFile(settingsfname,thisDetector->myDetectorType, myMod)) {
calfname=oscfn.str(); calfname=oscfn.str();
//#ifdef VERBOSE #ifdef VERBOSE
cout << calfname << endl; cout << calfname << endl;
//#endif #endif
readCalibrationFile(calfname,myMod->gain, myMod->offset); readCalibrationFile(calfname,myMod->gain, myMod->offset);
setModule(*myMod); setModule(*myMod);
} else { } else {