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

fixed segfault on loading trimbits

Browse Source
This commit is contained in:
Erik Frojdh
2019-03-18 18:10:50 +01:00
parent 43012e4f28
commit 38bf540c1a
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -1339,7 +1339,7 @@ int slsDetector::setThresholdEnergyAndSettings(int e_eV, detectorSettings isetti
FILE_LOG(logDEBUG1) << "Settings File is " << settingsfname;
//read the files
myMod = createModule(); // readSettings also checks if create module is null
// myMod = createModule(); // readSettings also checks if create module is null
if (nullptr == readSettingsFile(settingsfname, myMod, tb)) {
if (myMod) {
deleteModule(myMod);
@ -1392,7 +1392,10 @@ int slsDetector::setThresholdEnergyAndSettings(int e_eV, detectorSettings isetti
deleteModule(myMod2);
return FAIL;
}
myMod->iodelay = myMod1->iodelay;
// myMod = createModule();
// myMod->iodelay = myMod1->iodelay;
//interpolate module
myMod = interpolateTrim(myMod1, myMod2, e_eV, trim1, trim2, tb);
@ -1404,6 +1407,7 @@ int slsDetector::setThresholdEnergyAndSettings(int e_eV, detectorSettings isetti
return FAIL;
}
//interpolate tau
myMod->iodelay = myMod1->iodelay;
myMod->tau = linearInterpolation(e_eV, trim1, trim2, myMod1->tau, myMod2->tau);
//printf("new tau:%d\n",tau);