diff --git a/RTCP/Cobalt/InputProc/src/CMakeLists.txt b/RTCP/Cobalt/InputProc/src/CMakeLists.txt index ab2fab414628d4f5bc0f403dcb9daa882ef6e72f..c208f074e3914c58cbd42acfa73b83b5a4ddd394 100644 --- a/RTCP/Cobalt/InputProc/src/CMakeLists.txt +++ b/RTCP/Cobalt/InputProc/src/CMakeLists.txt @@ -47,6 +47,7 @@ lofar_add_bin_program(printDelays Delays/printDelays.cc) # install the logprop file install(FILES Delays/printDelays.log_prop + Station/generateRSP.log_prop DESTINATION etc) configure_file( diff --git a/RTCP/Cobalt/InputProc/src/Station/generateRSP.cc b/RTCP/Cobalt/InputProc/src/Station/generateRSP.cc index e981c981c28de1ba1177d55577e9f02d79560169..b11e6f65da29872f58c2cace93e08696214bea5c 100644 --- a/RTCP/Cobalt/InputProc/src/Station/generateRSP.cc +++ b/RTCP/Cobalt/InputProc/src/Station/generateRSP.cc @@ -152,8 +152,8 @@ int main(int argc, char **argv) RSPPacketFactory packetFactory(inStream, boardMode, subbands); RSP packet; - TimeStamp current(TimeStamp::convert(from, clockmode * 1000000)); - TimeStamp end(TimeStamp::convert(to, clockmode * 1000000)); + TimeStamp current(TimeStamp::convert(from, boardMode.clockHz())); + TimeStamp end(TimeStamp::convert(to, boardMode.clockHz())); while(current < end && packetFactory.makePacket(packet, current, boardNr)) { // Write packet diff --git a/RTCP/Cobalt/InputProc/src/Station/generateRSP.log_prop b/RTCP/Cobalt/InputProc/src/Station/generateRSP.log_prop new file mode 100644 index 0000000000000000000000000000000000000000..8ee08f727d7efab4a2142011548af313f8635584 --- /dev/null +++ b/RTCP/Cobalt/InputProc/src/Station/generateRSP.log_prop @@ -0,0 +1,31 @@ +# Note: generateRSP needs to log to stderr, to prevent clobbering its regular +# output on stdout. + +# Configure the loggers +log4cplus.rootLogger=INFO, STDERR +log4cplus.logger.TRC=INFO + +# prevent debug messages: accept >=WARN only, and don't forward messages to the rootLogger +log4cplus.logger.LCS.ApplCommon=WARN, STDERR +log4cplus.additivity.LCS.ApplCommon=false +log4cplus.logger.LCS.MSLofar=WARN, STDERR +log4cplus.additivity.LCS.MSLofar=false + +# Define the appenders +log4cplus.appender.STDOUT=log4cplus::ConsoleAppender +log4cplus.appender.STDOUT.layout=log4cplus::PatternLayout +log4cplus.appender.STDOUT.layout.ConversionPattern=printDelays@%h %D{%d-%m-%y %H:%M:%S.%q} %-5p %c{3} - %m [%b:%L]%n + +log4cplus.appender.STDERR=log4cplus::ConsoleAppender +log4cplus.appender.STDERR.layout=log4cplus::PatternLayout +log4cplus.appender.STDERR.layout.ConversionPattern=printDelays@%h %D{%d-%m-%y %H:%M:%S.%q} %-5p %c{3} - %m [%b:%L]%n +log4cplus.appender.STDERR.logToStdErr=true + +#log4cplus.appender.FILE=log4cplus::RollingFileAppender +#log4cplus.appender.FILE.File=${LOG4CPLUS_LOGFILENAME}.log +#log4cplus.appender.FILE.MaxFileSize=10MB +#log4cplus.appender.FILE.MaxBackupIndex=2 +#log4cplus.appender.FILE.layout=log4cplus::PatternLayout +#log4cplus.appender.FILE.layout.ConversionPattern=rtcp:${MPIRANK}@%h %D{%d-%m-%y %H:%M:%S.%q} %-5p %c{3} - %m [%b:%L]%n + +log4cplus.appender.DUMP=log4cplus::NullAppender diff --git a/RTCP/Cobalt/InputProc/test/t_generateRSP.cc b/RTCP/Cobalt/InputProc/test/t_generateRSP.cc index 0c748d1b9c5a9b1490e3f69ea03b5882c52ab6de..0bbe4525cb616a39803e1525e65be61ad225a855 100644 --- a/RTCP/Cobalt/InputProc/test/t_generateRSP.cc +++ b/RTCP/Cobalt/InputProc/test/t_generateRSP.cc @@ -118,7 +118,7 @@ int main() ofstream ascStream(ascFile.c_str()); generate_input(ascStream, bitMode[b], nrPackets[p], nrSubbands[s]); - command = str(format("../src/generateRSP -b%d -s%d < %s > %s") % + command = str(format("../src/generateRSP -b%d -s%d < %s -o %s") % bitMode[b] % nrSubbands[s] % ascFile % rspFile); cout << "Executing command: " << command << endl; ASSERT(system(command.c_str()) == 0);