diff --git a/slsDetectorSoftware/src/Module.cpp b/slsDetectorSoftware/src/Module.cpp index c1248c716..2fe19bd54 100644 --- a/slsDetectorSoftware/src/Module.cpp +++ b/slsDetectorSoftware/src/Module.cpp @@ -197,7 +197,7 @@ void Module::setSettings(detectorSettings isettings) { "Cannot set settings for Eiger. Use threshold energy."); } sendToDetector(F_SET_SETTINGS, isettings); - updateRxAllThresholdMetadata(); + updateRxThresholdEnergyMetadata(); } int Module::getThresholdEnergy() const { @@ -418,7 +418,7 @@ void Module::setAllThresholdEnergy(std::array e_eV, } } -void Module::updateRxAllThresholdMetadata() { +void Module::updateRxThresholdEnergyMetadata() { if (shm()->useReceiverFlag) { if (shm()->detType == MYTHEN3) { auto e_eV = getAllThresholdEnergy(); @@ -484,7 +484,7 @@ int Module::getAllTrimbits() const { void Module::setAllTrimbits(int val) { sendToDetector(F_SET_ALL_TRIMBITS, val); - updateRxAllThresholdMetadata(); + updateRxThresholdEnergyMetadata(); } std::vector Module::getTrimEn() const { @@ -812,7 +812,7 @@ void Module::resetToDefaultDacs(const bool hardReset) { void Module::setDAC(int val, dacIndex index, bool mV) { int args[]{static_cast(index), static_cast(mV), val}; sendToDetector(F_SET_DAC, args); - updateRxAllThresholdMetadata(); + updateRxThresholdEnergyMetadata(); } bool Module::getPowerChip() const { @@ -3613,7 +3613,7 @@ void Module::setModule(sls_detector_module &module, bool trimbits) { throw DetectorError("Module " + std::to_string(moduleIndex) + " returned error: " + client.readErrorMessage()); } - updateRxAllThresholdMetadata(); + updateRxThresholdEnergyMetadata(); } sls_detector_module Module::getModule() { diff --git a/slsDetectorSoftware/src/Module.h b/slsDetectorSoftware/src/Module.h index caf4991c7..b52a44012 100644 --- a/slsDetectorSoftware/src/Module.h +++ b/slsDetectorSoftware/src/Module.h @@ -110,7 +110,7 @@ class Module : public virtual slsDetectorDefs { void setAllThresholdEnergy(std::array e_eV, detectorSettings isettings, bool trimbits); std::string getSettingsDir() const; - void updateRxAllThresholdMetadata(); + void updateRxThresholdEnergyMetadata(); std::string setSettingsDir(const std::string &dir); void loadTrimbits(const std::string &fname); void saveTrimbits(const std::string &fname);