detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-13 13:27:14 +02:00
Code Issues Actions Packages Releases Activity

wip

Browse Source
This commit is contained in:
maliakal_d
2021-06-25 17:13:40 +02:00
parent 1b525abfa1
commit 8b22b5dbe7
3 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
slsDetectorServers/eigerDetectorServer/FebControl.c
View File

@ -1045,7 +1045,6 @@ int Feb_Control_SendSoftwareTrigger() {
int Feb_Control_SoftwareTrigger(int block) { int Feb_Control_SoftwareTrigger(int block) {
if (Feb_Control_activated) { if (Feb_Control_activated) {
LOG(logINFORED, ("block:%d\n", block));
// cant read reg // cant read reg
int readyForTrigger = 0; int readyForTrigger = 0;
if (!Feb_Control_IsReadyForTrigger(&readyForTrigger)) { if (!Feb_Control_IsReadyForTrigger(&readyForTrigger)) {

2
slsDetectorSoftware/src/Detector.cpp
View File

@ -726,7 +726,7 @@ void Detector::setNextFrameNumber(uint64_t value, Positions pos) {
} }
void Detector::sendSoftwareTrigger(const bool block, Positions pos) { void Detector::sendSoftwareTrigger(const bool block, Positions pos) {
pimpl->Parallel(&Module::sendSoftwareTrigger, pos, false); pimpl->Parallel(&Module::sendSoftwareTrigger, pos, block);
} }
Result<defs::scanParameters> Detector::getScan(Positions pos) const { Result<defs::scanParameters> Detector::getScan(Positions pos) const {

1
slsDetectorSoftware/src/Module.cpp
View File

@ -777,7 +777,6 @@ void Module::setNextFrameNumber(uint64_t value) {
} }
void Module::sendSoftwareTrigger(const bool block) { void Module::sendSoftwareTrigger(const bool block) {
LOG(logINFO) << "block:" << block;
sendToDetectorStop(F_SOFTWARE_TRIGGER, static_cast<int>(block), nullptr); sendToDetectorStop(F_SOFTWARE_TRIGGER, static_cast<int>(block), nullptr);
} }