detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-19 16:27:13 +02:00
Code Issues Actions Packages Releases Activity

Merge branch '2.3-rc' into hdf5

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-03-03 09:05:40 +01:00
parent fa6d18e9b2 475f0692a0
commit bdff083402
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -6983,7 +6983,7 @@ int slsDetector::loadSettingsFile(string fname, int imod) {
myMod->module=im;
//settings is saved in myMod.reg for all except mythen
if(thisDetector->myDetectorType!=MYTHEN)
myMod->reg=thisDetector->currentSettings;
myMod->reg=-1;
setModule(*myMod,iodelay,tau,-1,0,0);
deleteModule(myMod);
} else
@ -7107,7 +7107,7 @@ int slsDetector::loadCalibrationFile(string fname, int imod) {
if((myMod=getModule(im))){
//extra gain and offset
if(thisDetector->nGain){
if(readCalibrationFile(fn,gainval, offsetval)==FAIL)
if(readCalibrationFile(fn, gainval, offsetval)==FAIL)
return FAIL;
} //normal gain and offset inside sls_detector_module
else{