Compare commits

...

2 Commits

Author SHA1 Message Date
997e5dd96c fixed buffer overflow but caused by using global instead of local enum 2021-01-26 16:15:40 +01:00
7aeb394514 Pattern.h as a public header files (#229)
It is used in Detector.h.
2021-01-18 08:30:34 +01:00
2 changed files with 4 additions and 3 deletions

View File

@ -31,6 +31,7 @@ set(PUBLICHEADERS
include/sls/detectorData.h include/sls/detectorData.h
include/sls/Detector.h include/sls/Detector.h
include/sls/Result.h include/sls/Result.h
include/sls/Pattern.h
) )
#Shared library #Shared library

View File

@ -317,9 +317,9 @@ void Module::setAllThresholdEnergy(std::array<int, 3> e_eV,
myMod.dacs[M_VTRIM] = sum / counters.size(); myMod.dacs[M_VTRIM] = sum / counters.size();
// copy vth1, vth2 and vth3 from the correct threshold mods // copy vth1, vth2 and vth3 from the correct threshold mods
myMod.dacs[VTH1] = myMods[0].dacs[VTH1]; myMod.dacs[M_VTH1] = myMods[0].dacs[M_VTH1];
myMod.dacs[VTH2] = myMods[1].dacs[VTH2]; myMod.dacs[M_VTH2] = myMods[1].dacs[M_VTH2];
myMod.dacs[VTH3] = myMods[2].dacs[VTH3]; myMod.dacs[M_VTH3] = myMods[2].dacs[M_VTH3];
// check if dacs are different // check if dacs are different
for (size_t j = 0; j < 16; ++j) { for (size_t j = 0; j < 16; ++j) {