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

update rx master file for all threshold energies(m3) when setting dac directly, custom trimbits, setting settings, trimbits etc

Browse Source
This commit is contained in:
maliakal_d
2026-08-06 13:54:12 +02:00
parent 3e51239112
commit df1b6aafbc
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
slsDetectorSoftware/src/Module.cpp
+16
View File
@@ -196,6 +196,9 @@ 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());
}
}
int Module::getThresholdEnergy() const {
@@ -266,6 +269,8 @@ void Module::setThresholdEnergy(int e_eV, detectorSettings isettings,
}
}
void Module::setAllThresholdEnergy(std::array<int, 3> e_eV,
detectorSettings isettings, bool trimbits) {
if (shm()->detType != MYTHEN3) {
@@ -414,7 +419,9 @@ void Module::setAllThresholdEnergy(std::array<int, 3> e_eV,
throw RuntimeError("setThresholdEnergyAndSettings: Could not set "
"settings in Module");
}
}
void Module::updateRxAllThresholdMetadata(std::array<int, 3> e_eV) {
if (shm()->useReceiverFlag) {
sendToReceiver(F_RECEIVER_SET_ALL_THRESHOLD, e_eV, nullptr);
}
@@ -477,6 +484,9 @@ int Module::getAllTrimbits() const {
void Module::setAllTrimbits(int val) {
sendToDetector<int>(F_SET_ALL_TRIMBITS, val);
if (shm()->detType == MYTHEN3) {
updateRxAllThresholdMetadata(getAllThresholdEnergy());
}
}
std::vector<int> Module::getTrimEn() const {
@@ -784,6 +794,9 @@ 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());
}
}
bool Module::getPowerChip() const {
@@ -3552,6 +3565,9 @@ 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());
}
}
sls_detector_module Module::getModule() {
slsDetectorSoftware/src/Module.h
+2 -1
View File
@@ -110,7 +110,8 @@ class Module : public virtual slsDetectorDefs {
bool trimbits);
void setAllThresholdEnergy(std::array<int, 3> e_eV,
detectorSettings isettings, bool trimbits);
std::string getSettingsDir() const;
std::string getSettingsDir() const;
void updateRxAllThresholdMetadata(std::array<int, 3> e_eV);
std::string setSettingsDir(const std::string &dir);
void loadTrimbits(const std::string &fname);
void saveTrimbits(const std::string &fname);