From f390b7bba73084a22b62ffe3e989cf36ac274c9e Mon Sep 17 00:00:00 2001
From: l_maliakal_d <l_maliakal_d@951219d9-93cf-4727-9268-0efd64621fa3>
Date: Wed, 19 Jun 2013 09:33:52 +0000
Subject: [PATCH] small errors in read settings file for eiger

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@615 951219d9-93cf-4727-9268-0efd64621fa3
---
 .../slsDetectorAnalysis/energyConversion.cpp  | 24 +++++++------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/slsDetectorSoftware/slsDetectorAnalysis/energyConversion.cpp b/slsDetectorSoftware/slsDetectorAnalysis/energyConversion.cpp
index 9bfd59f23..f734f301b 100644
--- a/slsDetectorSoftware/slsDetectorAnalysis/energyConversion.cpp
+++ b/slsDetectorSoftware/slsDetectorAnalysis/energyConversion.cpp
@@ -117,7 +117,6 @@ slsDetectorDefs::sls_detector_module* energyConversion::readSettingsFile(string
 		names[id++]="Vtr";
 		names[id++]="Vrf";
 		names[id++]="Vrs";
-		names[id++]="Vin";
 		names[id++]="Vtgstv";
 		names[id++]="Vcmp_ll";
 		names[id++]="Vcmp_lr";
@@ -126,12 +125,9 @@ slsDetectorDefs::sls_detector_module* energyConversion::readSettingsFile(string
 		names[id++]="Vcmp_rr";
 		names[id++]="rxb_rb";
 		names[id++]="rxb_lb";
-		names[id++]="Vcmp_lr";
 		names[id++]="Vcp";
-		names[id++]="Vcmp_rl";
 		names[id++]="Vcn";
 		names[id++]="Vis";
-		names[id++]="iodelay";
 		break;
 	default:
 		cout << "Unknown detector type - unknown format for settings file" << endl;
@@ -248,6 +244,7 @@ slsDetectorDefs::sls_detector_module* energyConversion::readSettingsFile(string
 		case MOENCH:
 		case GOTTHARD:
 			//---------------dacs---------------
+
 			while(infile.good()) {
 				getline(infile,str);
 				iline++;
@@ -266,20 +263,17 @@ slsDetectorDefs::sls_detector_module* energyConversion::readSettingsFile(string
 						break;
 					}
 				}
-				if (i < id) {
-#ifdef VERBOSE
-					std::cout<< sargname << " dac nr. " << idac << " is " << ival << std::endl;
-#endif
-				}else{
-					std::cout<< "Unknown dac " << sargname << std::endl;
-					infile.close();
-					deleteModule(myMod);
-					return NULL;
-				}
 			}
-			break;
+			if (i < id) {
+#ifdef VERBOSE
+				std::cout<< sargname << " dac nr. " << idac << " is " << ival << std::endl;
+#endif
+			}else
+				std::cout<< "Unknown dac " << sargname << std::endl;
 
 
+			break;
+
 		default:
 			std::cout<< "Unknown detector type - don't know how to read file" <<  myfname << std::endl;
 			infile.close();