From 49812a34ae3e25b2a6f2ca0f189365c2badbb909 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Mon, 4 Feb 2019 17:31:58 +0100 Subject: [PATCH] manual acq changes for debugging --- manual/manual-acq/gotthard25.config | 19 +++++-------------- manual/manual-acq/main.cpp | 20 +++++++++++--------- 2 files changed, 16 insertions(+), 23 deletions(-) diff --git a/manual/manual-acq/gotthard25.config b/manual/manual-acq/gotthard25.config index 6a186f536..8ae5869ef 100644 --- a/manual/manual-acq/gotthard25.config +++ b/manual/manual-acq/gotthard25.config @@ -2,25 +2,16 @@ hostname bchip065+bchip195+ 0:rx_tcpport 1954 0:rx_udpport 50005 -0:detectorip 10.1.1.4 -#0:detectorip 10.90.90.4 -#0:detectorip 129.129.202.4 -#0:rx_udpip 129.129.202.92 -#0:rx_udpip 129.129.202.110 +0:detectorip 10.1.2.185 +0:rx_udpip 10.1.2.102 1:rx_tcpport 1955 1:rx_udpport 50006 -1:detectorip 10.1.1.5 -#1:detectorip 10.90.90.53 -#1:detectorip 129.129.202.5 -#1:rx_udpip 129.129.202.92 -#1:rx_udpip 129.129.202.110 +1:detectorip 10.1.2.186 +1:rx_udpip 10.1.2.102 -#rx_udpip 10.90.90.100 -rx_udpip 10.1.1.100 +rx_hostname pc1875 -rx_hostname pcmoench01 -#rx_hostname mpc2012 outdir /home/l_msdetect/dhanya/outdir vhighvoltage 0 diff --git a/manual/manual-acq/main.cpp b/manual/manual-acq/main.cpp index a8076f289..d50ca97e0 100644 --- a/manual/manual-acq/main.cpp +++ b/manual/manual-acq/main.cpp @@ -107,7 +107,7 @@ slsDetectorUsers * detector = NULL; /** Define Colors to print data call back in different colors for different recievers */ #define PRINT_IN_COLOR(c,f, ...) printf ("\033[%dm" f RESET, 30 + c+1, ##__VA_ARGS__) -#define PRINT_SEPARATOR() cprintf(RED, "============================================\n") +#define PRINT_SEPARATOR() cprintf(MAGENTA, "============================================\n") /************************************************************************ * \brief cleans the shared memory used by the camera @@ -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,8 +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 )) @@ -671,12 +670,15 @@ void Test(void) ReleaseReceivers(); - PRINT_SEPARATOR(); - std::cout << "Correct acquisition(s) " << acquisition_nb_ok << "/" << acquisition_nb << std::endl; + 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) { - std::cout << "Acquisition(s) gone wrong :" << std::endl; + cprintf(RED, "Acquisition(s) gone wrong :\n"); for (int list_index = 0; list_index < acquisition_nb_list.size(); ++list_index) { - std::cout << acquisition_nb_list[list_index] << std::endl; + cprintf(RED, "%d\n", acquisition_nb_list[list_index]); } } PRINT_SEPARATOR();