diff --git a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer index 2a7e02d7e..dae2823a5 100755 Binary files a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer and b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer differ diff --git a/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c index 0a720b9c9..5447ee9d1 100644 --- a/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c @@ -2008,12 +2008,12 @@ int startStateMachine() { LOG(logINFO, ("Virtual Acquisition started\n")); return OK; #else - LOG(logINFOBLUE, ("Starting State Machine\n")); + LOG(logINFO, ("Acquisition started bit toggled\n")); int ret = OK, prev_flag; // get the DAQ toggle bit prev_flag = Feb_Control_AcquisitionStartedBit(); - LOG(logINFO, ("Going to start acquisition\n")); + LOG(logINFOBLUE, ("Starting State Machine\n")); Feb_Control_StartAcquisition(); LOG(logINFO, ("requesting images right after start\n")); diff --git a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c index efc78f33c..4f743b047 100644 --- a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c +++ b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c @@ -1773,6 +1773,9 @@ int start_state_machine(int blocking, int file_des) { sharedMemory_setScanStatus(0); break; } +#ifdef EIGERD + prepareAcquisition(); +#endif ret = startStateMachine(); LOG(logDEBUG2, ("Starting Acquisition ret: %d\n", ret)); if (ret == FAIL) { diff --git a/slsDetectorSoftware/src/Detector.cpp b/slsDetectorSoftware/src/Detector.cpp index 683c7212e..64c187b80 100644 --- a/slsDetectorSoftware/src/Detector.cpp +++ b/slsDetectorSoftware/src/Detector.cpp @@ -525,9 +525,9 @@ void Detector::startReceiver() { pimpl->Parallel(&Module::startReceiver, {}); } void Detector::stopReceiver() { pimpl->Parallel(&Module::stopReceiver, {}); } void Detector::startDetector() { - if (getDetectorType().squash() == defs::EIGER) { + /*if (getDetectorType().squash() == defs::EIGER) { pimpl->Parallel(&Module::prepareAcquisition, {}); - } + }*/ pimpl->Parallel(&Module::startAcquisition, {}); }