renaming
Build on RHEL9 docker image / build (push) Successful in 4m11s
Build on RHEL8 docker image / build (push) Successful in 4m43s
Run Simulator Tests on local RHEL9 / build (push) Successful in 18m53s
Run Simulator Tests on local RHEL8 / build (push) Successful in 22m19s

This commit is contained in:
2026-08-06 14:03:35 +02:00
parent 888a5fb8f6
commit f158fdcd3e
2 changed files with 6 additions and 6 deletions
+5 -5
View File
@@ -197,7 +197,7 @@ void Module::setSettings(detectorSettings isettings) {
"Cannot set settings for Eiger. Use threshold energy.");
}
sendToDetector<int>(F_SET_SETTINGS, isettings);
updateRxAllThresholdMetadata();
updateRxThresholdEnergyMetadata();
}
int Module::getThresholdEnergy() const {
@@ -418,7 +418,7 @@ void Module::setAllThresholdEnergy(std::array<int, 3> 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<int>(F_SET_ALL_TRIMBITS, val);
updateRxAllThresholdMetadata();
updateRxThresholdEnergyMetadata();
}
std::vector<int> 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<int>(index), static_cast<int>(mV), val};
sendToDetector<int>(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() {
+1 -1
View File
@@ -110,7 +110,7 @@ class Module : public virtual slsDetectorDefs {
void setAllThresholdEnergy(std::array<int, 3> 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);