detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-08-06 18:52:25 +02:00
Code Issues Actions 1 Packages Releases Activity

refactored for future modifications for eier

Browse Source
This commit is contained in:
maliakal_d
2026-08-06 13:56:19 +02:00
parent f264085206
commit abef6ae4cd
2 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
slsDetectorSoftware/src/Module.cpp
+9 -14
View File
@@ -196,9 +196,7 @@ void Module::setSettings(detectorSettings isettings) {
"Cannot set settings for Eiger. Use threshold energy.");
}
sendToDetector<int>(F_SET_SETTINGS, isettings);
if (shm()->detType == MYTHEN3) {
updateRxAllThresholdMetadata(getAllThresholdEnergy());
}
updateRxAllThresholdMetadata();
}
int Module::getThresholdEnergy() const {
@@ -419,9 +417,12 @@ void Module::setAllThresholdEnergy(std::array<int, 3> e_eV,
}
}
void Module::updateRxAllThresholdMetadata(std::array<int, 3> e_eV) {
void Module::updateRxAllThresholdMetadata() {
if (shm()->useReceiverFlag) {
sendToReceiver(F_RECEIVER_SET_ALL_THRESHOLD, e_eV, nullptr);
if (shm()->detType == MYTHEN3) {
auto e_eV = getAllThresholdEnergy();
sendToReceiver(F_RECEIVER_SET_ALL_THRESHOLD, e_eV, nullptr);
}
}
}
@@ -482,9 +483,7 @@ int Module::getAllTrimbits() const {
void Module::setAllTrimbits(int val) {
sendToDetector<int>(F_SET_ALL_TRIMBITS, val);
if (shm()->detType == MYTHEN3) {
updateRxAllThresholdMetadata(getAllThresholdEnergy());
}
updateRxAllThresholdMetadata();
}
std::vector<int> Module::getTrimEn() const {
@@ -792,9 +791,7 @@ 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);
if (shm()->detType == MYTHEN3) {
updateRxAllThresholdMetadata(getAllThresholdEnergy());
}
updateRxAllThresholdMetadata();
}
bool Module::getPowerChip() const {
@@ -3563,9 +3560,7 @@ void Module::setModule(sls_detector_module &module, bool trimbits) {
client.sendCommand(F_SET_MODULE, nullptr, 0);
sendModule(&module, client);
client.readReply(nullptr, 0);
if (shm()->detType == MYTHEN3) {
updateRxAllThresholdMetadata(getAllThresholdEnergy());
}
updateRxAllThresholdMetadata();
}
sls_detector_module Module::getModule() {
slsDetectorSoftware/src/Module.h
+1 -1
View File
@@ -111,7 +111,7 @@ class Module : public virtual slsDetectorDefs {
void setAllThresholdEnergy(std::array<int, 3> e_eV,
detectorSettings isettings, bool trimbits);
std::string getSettingsDir() const;
void updateRxAllThresholdMetadata(std::array<int, 3> e_eV);
void updateRxAllThresholdMetadata();
std::string setSettingsDir(const std::string &dir);
void loadTrimbits(const std::string &fname);
void saveTrimbits(const std::string &fname);