mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2026-08-06 18:52:25 +02:00
renaming
This commit is contained in:
@@ -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() {
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user