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

some more changes in savesettings for gotthard and loadsettings

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@259 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2012-09-18 15:58:16 +00:00
parent 8ed87df48f
commit 7b058c55cf
2 changed files with 41 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -5107,12 +5107,12 @@ int slsDetector::loadSettingsFile(string fname, int imod) {
ostfn << ".sn" << setfill('0') << setw(3) << hex << getId(MODULE_SERIAL_NUMBER, im); ostfn << ".sn" << setfill('0') << setw(3) << hex << getId(MODULE_SERIAL_NUMBER, im);
fn=ostfn.str(); fn=ostfn.str();
} }
//settings is saved in myMod.reg for gotthard
if(thisDetector->myDetectorType==GOTTHARD)
myMod->reg=thisDetector->currentSettings;
myMod=readSettingsFile(fn, thisDetector->myDetectorType); myMod=readSettingsFile(fn, thisDetector->myDetectorType);
if (myMod) { if (myMod) {
myMod->module=im; myMod->module=im;
//settings is saved in myMod.reg for gotthard
if(thisDetector->myDetectorType==GOTTHARD)
myMod->reg=thisDetector->currentSettings;
setModule(*myMod); setModule(*myMod);
deleteModule(myMod); deleteModule(myMod);
} else } else

2
slsDetectorSoftware/slsDetectorAnalysis/energyConversion.cpp
View File

@ -288,6 +288,7 @@ int energyConversion::writeSettingsFile(string fname, detectorType myDetectorTyp
outfile << names[idac] << " " << iv << std::endl; outfile << names[idac] << " " << iv << std::endl;
} }
if(myDetectorType!=GOTTHARD){
for (ichip=0; ichip<mod.nchip; ichip++) { for (ichip=0; ichip<mod.nchip; ichip++) {
iv1=mod.chipregs[ichip]&1; iv1=mod.chipregs[ichip]&1;
outfile << names[idac] << " " << iv1 << std::endl; outfile << names[idac] << " " << iv1 << std::endl;
@ -312,6 +313,7 @@ int energyConversion::writeSettingsFile(string fname, detectorType myDetectorTyp
outfile << iv1 << std::endl; outfile << iv1 << std::endl;
} }
} }
}
outfile.close(); outfile.close();
return OK; return OK;
} else { } else {