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-15 16:27:09 +02:00
parent 22bcac4c0b
commit 994f0a71a6
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorServers/eigerDetectorServer/FebControl.c
View File

@ -999,13 +999,13 @@ int Feb_Control_StartAcquisition() {
int Feb_Control_StopAcquisition() { int Feb_Control_StopAcquisition() {
if (Feb_Control_activated) { if (Feb_Control_activated) {
// sends last // sends last
unsigned int orig_value = 0; /*unsigned int orig_value = 0;
if (!Feb_Interface_ReadRegister(Feb_Control_AddressToAll(), if (!Feb_Interface_ReadRegister(Feb_Control_AddressToAll(),
DAQ_REG_CTRL, &orig_value)) { DAQ_REG_CTRL, &orig_value)) {
LOG(logERROR, ("Could not read DAQ_REG_CHIP_CMDS to send software " LOG(logERROR, ("Could not read DAQ_REG_CHIP_CMDS to send software "
"trigger\n")); "trigger\n"));
return 0; return 0;
} }*/
if (!Feb_Interface_WriteRegister(Feb_Control_AddressToAll(), if (!Feb_Interface_WriteRegister(Feb_Control_AddressToAll(),
DAQ_REG_CTRL, DAQ_REG_CTRL,
orig_value | DAQ_CTRL_STOP, 0, 0)) { orig_value | DAQ_CTRL_STOP, 0, 0)) {

8
slsDetectorSoftware/src/Detector.cpp
View File

@ -697,7 +697,7 @@ void Detector::startDetectorReadout() {
} }
void Detector::stopDetector(Positions pos) { void Detector::stopDetector(Positions pos) {
auto detector_type = getDetectorType().squash(); /*auto detector_type = getDetectorType().squash();
if (detector_type == defs::EIGER && size() > 1) { if (detector_type == defs::EIGER && size() > 1) {
auto is_master = getMaster(); auto is_master = getMaster();
int masterPosition = -1; int masterPosition = -1;
@ -716,9 +716,9 @@ void Detector::stopDetector(Positions pos) {
if (masterPosition != -1) { if (masterPosition != -1) {
pimpl->Parallel(&Module::stopAcquisition, {masterPosition}); pimpl->Parallel(&Module::stopAcquisition, {masterPosition});
} }
} else { } else {*/
pimpl->Parallel(&Module::stopAcquisition, pos); pimpl->Parallel(&Module::stopAcquisition, pos);
} //}
} }
Result<defs::runStatus> Detector::getDetectorStatus(Positions pos) const { Result<defs::runStatus> Detector::getDetectorStatus(Positions pos) const {