detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-20 09:31:03 +01:00
Code Issues Actions Packages Releases Activity

Merge branch 'eiger' of github.com:slsdetectorgroup/slsDetectorPackage into eiger

Browse Source
This commit is contained in:
maliakal_d
2020-08-03 14:29:23 +02:00
parent acc43842eb 63a5b4d61f
commit 3cdf98b230
4 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
python/scripts/generate_enums.py
View File

@@ -42,6 +42,7 @@ def extract_enums(lines):
except: except:
pass pass
fields = [f.strip() for f in fields]
enums[enum_name] = fields enums[enum_name] = fields
return enums return enums

11
python/slsdet/detector.py
View File

@@ -601,13 +601,12 @@ class Detector(CppDetectorApi):
self.setRateCorrection(tau) self.setRateCorrection(tau)
@property @property
def clkdivider(self): def speed(self):
res = [int(value) for value in self.getSpeed()] return element_if_equal(self.getSpeed())
return element_if_equal(res)
@clkdivider.setter @speed.setter
def clkdivider(self, value): def speed(self, value):
self.setSpeed(speedLevel(value)) self.setSpeed(value)
@property @property
def frameindex(self): def frameindex(self):

1
python/src/enums.cpp
View File

@@ -176,6 +176,7 @@ void init_enums(py::module &m) {
slsDetectorDefs::dacIndex::TEMPERATURE_FPGA2) slsDetectorDefs::dacIndex::TEMPERATURE_FPGA2)
.value("TEMPERATURE_FPGA3", .value("TEMPERATURE_FPGA3",
slsDetectorDefs::dacIndex::TEMPERATURE_FPGA3) slsDetectorDefs::dacIndex::TEMPERATURE_FPGA3)
.value("TRIMBIT_SCAN", slsDetectorDefs::dacIndex::TRIMBIT_SCAN)
.value("V_POWER_A", slsDetectorDefs::dacIndex::V_POWER_A) .value("V_POWER_A", slsDetectorDefs::dacIndex::V_POWER_A)
.value("V_POWER_B", slsDetectorDefs::dacIndex::V_POWER_B) .value("V_POWER_B", slsDetectorDefs::dacIndex::V_POWER_B)
.value("V_POWER_C", slsDetectorDefs::dacIndex::V_POWER_C) .value("V_POWER_C", slsDetectorDefs::dacIndex::V_POWER_C)

6
slsDetectorSoftware/src/Module.cpp
View File

@@ -1168,10 +1168,8 @@ void Module::sendReceiverRateCorrections(const std::vector<int64_t> &t) {
<< ']'; << ']';
auto receiver = ReceiverSocket(shm()->rxHostname, shm()->rxTCPPort); auto receiver = ReceiverSocket(shm()->rxHostname, shm()->rxTCPPort);
receiver.Send(F_SET_RECEIVER_RATE_CORRECT); receiver.Send(F_SET_RECEIVER_RATE_CORRECT);
// TODO: use overload for vector receiver.Send(static_cast<int>(t.size()));
int size = t.size(); receiver.Send(t);
receiver.Send(size);
receiver.Send(t.data(), t.size() * sizeof(t[0]));
if (receiver.Receive<int>() == FAIL) { if (receiver.Receive<int>() == FAIL) {
throw RuntimeError("Receiver " + std::to_string(moduleId) + throw RuntimeError("Receiver " + std::to_string(moduleId) +
" returned error: " + receiver.readErrorMessage()); " returned error: " + receiver.readErrorMessage());