From f5413637c46f851d8580d02121225438cf14da73 Mon Sep 17 00:00:00 2001
From: l_maliakal_d <l_maliakal_d@951219d9-93cf-4727-9268-0efd64621fa3>
Date: Fri, 31 Jan 2014 16:31:39 +0000
Subject: [PATCH] changed the settings comments to include that it is loaded
 successfully

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@731 951219d9-93cf-4727-9268-0efd64621fa3
---
 slsDetectorSoftware/slsDetector/slsDetector.cpp          | 4 +++-
 .../slsDetectorAnalysis/energyConversion.cpp             | 9 +++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp
index dc404a0ed..4b70951c8 100644
--- a/slsDetectorSoftware/slsDetector/slsDetector.cpp
+++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp
@@ -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();
diff --git a/slsDetectorSoftware/slsDetectorAnalysis/energyConversion.cpp b/slsDetectorSoftware/slsDetectorAnalysis/energyConversion.cpp
index eea9bf990..196afe77b 100644
--- a/slsDetectorSoftware/slsDetectorAnalysis/energyConversion.cpp
+++ b/slsDetectorSoftware/slsDetectorAnalysis/energyConversion.cpp
@@ -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);