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

small errors in read settings file for eiger

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@615 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2013-06-19 09:33:52 +00:00
parent b661b37b03
commit f390b7bba7
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
slsDetectorSoftware/slsDetectorAnalysis/energyConversion.cpp
View File

@ -117,7 +117,6 @@ slsDetectorDefs::sls_detector_module* energyConversion::readSettingsFile(string
names[id++]="Vtr"; names[id++]="Vtr";
names[id++]="Vrf"; names[id++]="Vrf";
names[id++]="Vrs"; names[id++]="Vrs";
names[id++]="Vin";
names[id++]="Vtgstv"; names[id++]="Vtgstv";
names[id++]="Vcmp_ll"; names[id++]="Vcmp_ll";
names[id++]="Vcmp_lr"; names[id++]="Vcmp_lr";
@ -126,12 +125,9 @@ slsDetectorDefs::sls_detector_module* energyConversion::readSettingsFile(string
names[id++]="Vcmp_rr"; names[id++]="Vcmp_rr";
names[id++]="rxb_rb"; names[id++]="rxb_rb";
names[id++]="rxb_lb"; names[id++]="rxb_lb";
names[id++]="Vcmp_lr";
names[id++]="Vcp"; names[id++]="Vcp";
names[id++]="Vcmp_rl";
names[id++]="Vcn"; names[id++]="Vcn";
names[id++]="Vis"; names[id++]="Vis";
names[id++]="iodelay";
break; break;
default: default:
cout << "Unknown detector type - unknown format for settings file" << endl; cout << "Unknown detector type - unknown format for settings file" << endl;
@ -248,6 +244,7 @@ slsDetectorDefs::sls_detector_module* energyConversion::readSettingsFile(string
case MOENCH: case MOENCH:
case GOTTHARD: case GOTTHARD:
//---------------dacs--------------- //---------------dacs---------------
while(infile.good()) { while(infile.good()) {
getline(infile,str); getline(infile,str);
iline++; iline++;
@ -266,20 +263,17 @@ slsDetectorDefs::sls_detector_module* energyConversion::readSettingsFile(string
break; 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: default:
std::cout<< "Unknown detector type - don't know how to read file" << myfname << std::endl; std::cout<< "Unknown detector type - don't know how to read file" << myfname << std::endl;
infile.close(); infile.close();