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

WIP, eiger

Browse Source
This commit is contained in:
maliakal_d
2020-06-30 10:55:31 +02:00
parent f1cbf49449
commit 488e0230ba
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer
View File

Binary file not shown.

4
slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -2008,12 +2008,12 @@ int startStateMachine() {
LOG(logINFO, ("Virtual Acquisition started\n")); LOG(logINFO, ("Virtual Acquisition started\n"));
return OK; return OK;
#else #else
LOG(logINFOBLUE, ("Starting State Machine\n")); LOG(logINFO, ("Acquisition started bit toggled\n"));
int ret = OK, prev_flag; int ret = OK, prev_flag;
// get the DAQ toggle bit // get the DAQ toggle bit
prev_flag = Feb_Control_AcquisitionStartedBit(); prev_flag = Feb_Control_AcquisitionStartedBit();
LOG(logINFO, ("Going to start acquisition\n")); LOG(logINFOBLUE, ("Starting State Machine\n"));
Feb_Control_StartAcquisition(); Feb_Control_StartAcquisition();
LOG(logINFO, ("requesting images right after start\n")); LOG(logINFO, ("requesting images right after start\n"));

3
slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
View File

@ -1773,6 +1773,9 @@ int start_state_machine(int blocking, int file_des) {
sharedMemory_setScanStatus(0); sharedMemory_setScanStatus(0);
break; break;
} }
#ifdef EIGERD
prepareAcquisition();
#endif
ret = startStateMachine(); ret = startStateMachine();
LOG(logDEBUG2, ("Starting Acquisition ret: %d\n", ret)); LOG(logDEBUG2, ("Starting Acquisition ret: %d\n", ret));
if (ret == FAIL) { if (ret == FAIL) {

4
slsDetectorSoftware/src/Detector.cpp
View File

@ -525,9 +525,9 @@ void Detector::startReceiver() { pimpl->Parallel(&Module::startReceiver, {}); }
void Detector::stopReceiver() { pimpl->Parallel(&Module::stopReceiver, {}); } void Detector::stopReceiver() { pimpl->Parallel(&Module::stopReceiver, {}); }
void Detector::startDetector() { void Detector::startDetector() {
if (getDetectorType().squash() == defs::EIGER) { /*if (getDetectorType().squash() == defs::EIGER) {
pimpl->Parallel(&Module::prepareAcquisition, {}); pimpl->Parallel(&Module::prepareAcquisition, {});
} }*/
pimpl->Parallel(&Module::startAcquisition, {}); pimpl->Parallel(&Module::startAcquisition, {});
} }