detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-20 02:40:03 +02:00
Code Issues Actions Packages Releases Activity

manual acq: uncomment insignificant

Browse Source
This commit is contained in:
maliakal_d 2019-02-05 10:36:33 +01:00
parent 49812a34ae
commit dfca81208b
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
manual/manual-acq/main.cpp
View File

@ -20,9 +20,9 @@
#include "sls_detector_defs.h" #include "sls_detector_defs.h"
#include "slsDetectorUsers.h" #include "slsDetectorUsers.h"
#define GOTTHARD_25_TEST //#define GOTTHARD_25_TEST
//#define JUNGFRAU_TEST //#define JUNGFRAU_TEST
//#define GOTTHARD_TEST #define GOTTHARD_TEST
//====================================================================================================== //======================================================================================================
// test configuration // test configuration
@ -425,13 +425,13 @@ void CreateDetector(void)
} }
// configuration file is used to properly configure advanced settings in the shared memory // configuration file is used to properly configure advanced settings in the shared memory
/*result = detector->readConfigurationFile(detector_config_file_name); result = detector->readConfigurationFile(detector_config_file_name);
if(result == slsDetectorDefs::FAIL) if(result == slsDetectorDefs::FAIL)
{ {
std::cout << "readConfigurationFile failed! Could not initialize the camera!" << std::endl; std::cout << "readConfigurationFile failed! Could not initialize the camera!" << std::endl;
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
}*/ }
// set detector in shared memory online (in case no config file was used) */ // set detector in shared memory online (in case no config file was used) */
detector->setOnline(slsDetectorDefs::ONLINE_FLAG); detector->setOnline(slsDetectorDefs::ONLINE_FLAG);
@ -580,7 +580,7 @@ int RunAcquisition(void)
for(;;) for(;;)
{ {
// checking if the hardware acquisition is running // checking if the hardware acquisition is running
int status = detector->getDetectorStatus(); int status = detector->getDetectorStatus();
if((status == slsDetectorDefs::IDLE ) || if((status == slsDetectorDefs::IDLE ) ||
(status == slsDetectorDefs::STOPPED) || (status == slsDetectorDefs::STOPPED) ||
(status == slsDetectorDefs::ERROR )) (status == slsDetectorDefs::ERROR ))
@ -670,10 +670,10 @@ void Test(void)
ReleaseReceivers(); ReleaseReceivers();
PRINT_SEPARATOR(); PRINT_SEPARATOR();
if (acquisition_nb - acquisition_nb_ok) if (acquisition_nb - acquisition_nb_ok)
cprintf(BOLD RED, "Correct acquisition(s) %d/%d\n", acquisition_nb_ok, acquisition_nb); cprintf(BOLD RED, "Correct acquisition(s) %d/%d\n", acquisition_nb_ok, acquisition_nb);
else else
cprintf(BOLD GREEN, "Correct acquisition(s) %d/%d\n", acquisition_nb_ok, acquisition_nb); cprintf(BOLD GREEN, "Correct acquisition(s) %d/%d\n", acquisition_nb_ok, acquisition_nb);
if (acquisition_nb - acquisition_nb_ok) { if (acquisition_nb - acquisition_nb_ok) {
cprintf(RED, "Acquisition(s) gone wrong :\n"); cprintf(RED, "Acquisition(s) gone wrong :\n");