From dfca81208bb3f804adeb4a341439e6b07064d2f8 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Tue, 5 Feb 2019 10:36:33 +0100 Subject: [PATCH] manual acq: uncomment insignificant --- manual/manual-acq/main.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/manual/manual-acq/main.cpp b/manual/manual-acq/main.cpp index d50ca97e0..09fe3ce81 100644 --- a/manual/manual-acq/main.cpp +++ b/manual/manual-acq/main.cpp @@ -20,9 +20,9 @@ #include "sls_detector_defs.h" #include "slsDetectorUsers.h" -#define GOTTHARD_25_TEST +//#define GOTTHARD_25_TEST //#define JUNGFRAU_TEST -//#define GOTTHARD_TEST +#define GOTTHARD_TEST //====================================================================================================== // test configuration @@ -425,13 +425,13 @@ void CreateDetector(void) } // 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) { std::cout << "readConfigurationFile failed! Could not initialize the camera!" << std::endl; exit(EXIT_FAILURE); - }*/ + } // set detector in shared memory online (in case no config file was used) */ detector->setOnline(slsDetectorDefs::ONLINE_FLAG); @@ -580,7 +580,7 @@ int RunAcquisition(void) for(;;) { // checking if the hardware acquisition is running - int status = detector->getDetectorStatus(); + int status = detector->getDetectorStatus(); if((status == slsDetectorDefs::IDLE ) || (status == slsDetectorDefs::STOPPED) || (status == slsDetectorDefs::ERROR )) @@ -670,10 +670,10 @@ void Test(void) ReleaseReceivers(); - PRINT_SEPARATOR(); - if (acquisition_nb - acquisition_nb_ok) - cprintf(BOLD RED, "Correct acquisition(s) %d/%d\n", acquisition_nb_ok, acquisition_nb); - else + PRINT_SEPARATOR(); + if (acquisition_nb - acquisition_nb_ok) + cprintf(BOLD RED, "Correct acquisition(s) %d/%d\n", acquisition_nb_ok, acquisition_nb); + else cprintf(BOLD GREEN, "Correct acquisition(s) %d/%d\n", acquisition_nb_ok, acquisition_nb); if (acquisition_nb - acquisition_nb_ok) { cprintf(RED, "Acquisition(s) gone wrong :\n");