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

changed the settings comments to include that it is loaded successfully

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@731 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2014-01-31 16:31:39 +00:00
parent 64d9223cb3
commit f5413637c4
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -2884,6 +2884,8 @@ slsDetectorDefs::detectorSettings slsDetector::setSettings( detectorSettings ise
ostringstream ostfn, oscfn;
myMod->module=im;
std::cout << std::endl << "Loading settings for module:" << im << std::endl;
//create file names
switch(thisDetector->myDetectorType){
case EIGER:
@ -2912,7 +2914,7 @@ slsDetectorDefs::detectorSettings slsDetector::setSettings( detectorSettings ise
settingsfname=ostfn.str();
#ifdef VERBOSE
cout << "the settings name is "<<settingsfname << endl;
cout << "the settings file name is "<<settingsfname << endl;
#endif
if (readSettingsFile(settingsfname,thisDetector->myDetectorType, myMod)) {
calfname=oscfn.str();

9
slsDetectorSoftware/slsDetectorAnalysis/energyConversion.cpp
View File

@ -28,6 +28,7 @@ int energyConversion::readCalibrationFile(string fname, double &gain, double &of
istringstream ssstr(str);
ssstr >> offset >> gain;
infile.close();
cout << "Calibration file loaded: " << fname << endl;
} else {
std::cout<< "Could not open calibration file "<< fname << std::endl;
gain=0.;
@ -229,7 +230,7 @@ slsDetectorDefs::sls_detector_module* energyConversion::readSettingsFile(string
infile.close();
strcpy(settingsFile,fname.c_str());
cout << "Settings file loaded: " << settingsFile << endl;
return myMod;
}
@ -255,7 +256,7 @@ slsDetectorDefs::sls_detector_module* energyConversion::readSettingsFile(string
}
infile.close();
strcpy(settingsFile,fname.c_str());
cout << "Settings file loaded: " << settingsFile << endl;
return myMod;
}
@ -295,7 +296,7 @@ slsDetectorDefs::sls_detector_module* energyConversion::readSettingsFile(string
infile.close();
strcpy(settingsFile,fname.c_str());
cout << "Settings file loaded: " << settingsFile << endl;
return myMod;
}
@ -311,7 +312,7 @@ slsDetectorDefs::sls_detector_module* energyConversion::readSettingsFile(string
}
std::cout<< "could not open settings file " << myfname << std::endl;
std::cout<< "Error: Could not open settings file " << myfname << std::endl;
if (nflag)
deleteModule(myMod);