diff --git a/MAC/APL/Appl_Controller/ACDaemon.conf b/MAC/APL/Appl_Controller/ACDaemon.conf index d801b9db1c9095495ed58d64513a50430b0c7555..fa1b366bf8de7b9623ecb4059a5ffd3e5c38d0b6 100644 --- a/MAC/APL/Appl_Controller/ACDaemon.conf +++ b/MAC/APL/Appl_Controller/ACDaemon.conf @@ -8,4 +8,4 @@ ACDaemon.ACpoolsize = 30 # size of AC port pool ACDaemon.aliveinterval = 1 m # for AC ACDaemon.alivetimeout = 5 m # remove AC after this period ACDaemon.adminfile = ACD.admin # file to survive power failures -ACDaemon.command = ./ApplController %s 1>>/opt/lofar/log/ApplController.log 2>&1 & # redirect STDOUT and STDERR in case Log4Cout is used +ACDaemon.command = ./ApplController %s >&/dev/null & diff --git a/MAC/APL/Appl_Controller/ACDaemon.log_prop b/MAC/APL/Appl_Controller/ACDaemon.log_prop index 21507e3cb9488cbda185eac46f10995374c56a3d..0ba7df27c156281395155e01150d073237c05740 100644 --- a/MAC/APL/Appl_Controller/ACDaemon.log_prop +++ b/MAC/APL/Appl_Controller/ACDaemon.log_prop @@ -1,6 +1,6 @@ # Configure the loggers -log4cplus.rootLogger=DEBUG, STDOUT, FILE +log4cplus.rootLogger=INFO, STDOUT, FILE log4cplus.logger.TRC=INFO log4cplus.logger.LCS.Common=FATAL, STDOUT, FILE diff --git a/MAC/APL/Appl_Controller/ApplController.log_prop b/MAC/APL/Appl_Controller/ApplController.log_prop index 21507e3cb9488cbda185eac46f10995374c56a3d..0ba7df27c156281395155e01150d073237c05740 100644 --- a/MAC/APL/Appl_Controller/ApplController.log_prop +++ b/MAC/APL/Appl_Controller/ApplController.log_prop @@ -1,6 +1,6 @@ # Configure the loggers -log4cplus.rootLogger=DEBUG, STDOUT, FILE +log4cplus.rootLogger=INFO, STDOUT, FILE log4cplus.logger.TRC=INFO log4cplus.logger.LCS.Common=FATAL, STDOUT, FILE diff --git a/RTCP/CNProc/src/CN_Processing.cc b/RTCP/CNProc/src/CN_Processing.cc index da312f8ff3f0f77b7cdb5d8f1604e9fda040ae92..cb0a39972b3deb2bb355db3e9abcaafd1e9233e0 100644 --- a/RTCP/CNProc/src/CN_Processing.cc +++ b/RTCP/CNProc/src/CN_Processing.cc @@ -109,9 +109,11 @@ template <typename SAMPLE_TYPE> CN_Processing<SAMPLE_TYPE>::CN_Processing(const itsTranspose2Logic(parset.CN_transposeLogic(0, 0)) #endif { +#if defined DEBUG_TRANSPOSE2 if(LOG_CONDITION) for (unsigned i = 0; i < itsTranspose2Logic.nrStreams(); i++) itsTranspose2Logic.streamInfo[i].log(); +#endif #if defined HAVE_MPI unsigned myPset = itsLocationInfo.psetNumber(); @@ -187,7 +189,8 @@ template <typename SAMPLE_TYPE> CN_Processing<SAMPLE_TYPE>::CN_Processing(const itsTransposedInputData = new TransposedData<SAMPLE_TYPE>(itsNrStations, parset.nrSamplesToCNProc(), itsBigAllocator); #if defined HAVE_MPI - LOG_DEBUG_STR("Processes subbands " << itsCurrentSubband->list()); + if (LOG_CONDITION) + LOG_DEBUG_STR("Processes subbands " << itsCurrentSubband->list()); #endif // HAVE_MPI itsPPF = new PPF<SAMPLE_TYPE>(itsNrStations, itsNrChannels, itsNrSamplesPerIntegration, parset.sampleRate() / itsNrChannels, parset.delayCompensation() || itsTotalNrPencilBeams > 1 || parset.correctClocks(), parset.correctBandPass(), itsLocationInfo.rank() == 0); @@ -198,7 +201,8 @@ template <typename SAMPLE_TYPE> CN_Processing<SAMPLE_TYPE>::CN_Processing(const if (parset.onlineFlagging() && parset.onlinePreCorrelationFlagging()) { itsPreCorrelationFlagger = new PreCorrelationFlagger(parset, itsNrStations, itsNrChannels, itsNrSamplesPerIntegration); - LOG_DEBUG_STR("Online PreCorrelation flagger enabled"); + if (LOG_CONDITION) + LOG_DEBUG_STR("Online PreCorrelation flagger enabled"); } if (parset.outputCorrelatedData()) { @@ -208,11 +212,13 @@ template <typename SAMPLE_TYPE> CN_Processing<SAMPLE_TYPE>::CN_Processing(const if (parset.onlineFlagging() && parset.onlinePostCorrelationFlagging()) { itsPostCorrelationFlagger = new PostCorrelationFlagger(parset, nrMergedStations, itsNrChannels); - LOG_DEBUG_STR("Online PostCorrelation flagger enabled"); + if (LOG_CONDITION) + LOG_DEBUG_STR("Online PostCorrelation flagger enabled"); } if (parset.onlineFlagging() && parset.onlinePostCorrelationFlagging() && parset.onlinePostCorrelationFlaggingDetectBrokenStations()) { - LOG_DEBUG_STR("Online PostCorrelation flagger Detect Broken Stations enabled"); + if (LOG_CONDITION) + LOG_DEBUG_STR("Online PostCorrelation flagger Detect Broken Stations enabled"); } diff --git a/RTCP/IONProc/src/Job.cc b/RTCP/IONProc/src/Job.cc index f6db7579f6dd64d6e3f3f6cc2b9c5122d6ab9cb0..31756a5b9655d82b76e9e18d49ea478c24ecdaa5 100644 --- a/RTCP/IONProc/src/Job.cc +++ b/RTCP/IONProc/src/Job.cc @@ -521,7 +521,7 @@ void Job::jobThread() if (canStart) { // PLC: INIT phase if (itsParset.realTime()) - waitUntilCloseToStartOfObservation(10); + waitUntilCloseToStartOfObservation(20); // PLC: in practice, RUN must start here, because resources // can become available just before the observation starts.