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

fixed the gain and offset default values uploaded for eiger

Browse Source
This commit is contained in:
Dhanya Maliakal
2015-10-14 10:38:39 +02:00
parent 5057fd4eef
commit 25dbaa4e09
3 changed files with 37 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -3059,10 +3059,6 @@ slsDetectorDefs::detectorSettings slsDetector::setSettings( detectorSettings ise
int ret=0;
if(thisDetector->nGain)
gainval = new int[thisDetector->nGain];
if(thisDetector->nOffset)
offsetval = new int[thisDetector->nOffset];
switch (isettings) {
case STANDARD:
@ -5986,7 +5982,17 @@ int slsDetector::writeSettingsFile(string fname, int imod){
int slsDetector::loadSettingsFile(string fname, int imod) {
sls_detector_module *myMod=NULL;
int* g=0; int* o=0;
int* gainval=0; int* offsetval=0;
if(thisDetector->nGain){
gainval=new int[thisDetector->nGain];
for(int i=0;i<thisDetector->nGain;i++)
gainval[i] = -1;
}
if(thisDetector->nOffset){
offsetval=new int[thisDetector->nOffset];
for(int i=0;i<thisDetector->nOffset;i++)
offsetval[i] = -1;
}
string fn=fname;
fn=fname;
int mmin=0, mmax=setNumberOfModules();
@ -6012,8 +6018,10 @@ int slsDetector::loadSettingsFile(string fname, int imod) {
//settings is saved in myMod.reg for all except mythen
if(thisDetector->myDetectorType!=MYTHEN)
myMod->reg=thisDetector->currentSettings;
setModule(*myMod,g,o);
setModule(*myMod,gainval,offsetval);
deleteModule(myMod);
if(gainval) delete[] gainval;
if(offsetval) delete[] offsetval;
} else
return FAIL;
}
@ -6090,19 +6098,20 @@ int slsDetector::loadCalibrationFile(string fname, int imod) {
sls_detector_module *myMod=NULL;
string fn=fname;
int* gainval=0, *offsetval=0;
if(thisDetector->nGain)
int* gainval=0; int* offsetval=0;
if(thisDetector->nGain){
gainval=new int[thisDetector->nGain];
if(thisDetector->nOffset)
for(int i=0;i<thisDetector->nGain;i++)
gainval[i] = -1;
}
if(thisDetector->nOffset){
offsetval=new int[thisDetector->nOffset];
for(int i=0;i<thisDetector->nOffset;i++)
offsetval[i] = -1;
}
fn=fname;
if(thisDetector->nGain)
gainval = new int[thisDetector->nGain];
if(thisDetector->nOffset)
offsetval = new int[thisDetector->nOffset];
int mmin=0, mmax=setNumberOfModules();
if (imod>=0) {
@ -6135,7 +6144,7 @@ int slsDetector::loadCalibrationFile(string fname, int imod) {
deleteModule(myMod);
if(gainval) delete[]gainval;
if(offsetval) delete offsetval;
if(offsetval) delete[] offsetval;
} else
return FAIL;
}