diff --git a/src/ctbin/ctbin.cpp b/src/ctbin/ctbin.cpp index 75f2f44..aa56393 100644 --- a/src/ctbin/ctbin.cpp +++ b/src/ctbin/ctbin.cpp @@ -619,7 +619,6 @@ void ctbin::fill_cube(GCTAObservation* obs) // Log cube if (logExplicit()) { - log.header1("Counts cube"); log << m_counts << std::endl; } diff --git a/src/ctbkgcube/ctbkgcube.cpp b/src/ctbkgcube/ctbkgcube.cpp index 6fd0cba..4c08b70 100644 --- a/src/ctbkgcube/ctbkgcube.cpp +++ b/src/ctbkgcube/ctbkgcube.cpp @@ -401,8 +401,8 @@ void ctbkgcube::save(void) // Log filename if (logTerse()) { - log << "Save background cube into file \""+m_outcube+"\"."; - log << std::endl; + log << gammalib::parformat("Background cube file"); + log << m_outcube.url() << std::endl; } // Save background cube @@ -416,8 +416,8 @@ void ctbkgcube::save(void) // Log filename if (logTerse()) { - log << "Save model into file \""+m_outmodel.url()+"\"."; - log << std::endl; + log << gammalib::parformat("Model definition file"); + log << m_outmodel.url() << std::endl; } // Save output model for stacked analyses @@ -451,7 +451,8 @@ void ctbkgcube::publish(const std::string& name) // Log filename if (logTerse()) { - log << "Publish \""+user_name+"\" background cube." << std::endl; + log << gammalib::parformat("Publish background cube"); + log << user_name << std::endl; } // Publish exposure cube diff --git a/src/ctcubemask/ctcubemask.cpp b/src/ctcubemask/ctcubemask.cpp index 85d7658..89090ca 100644 --- a/src/ctcubemask/ctcubemask.cpp +++ b/src/ctcubemask/ctcubemask.cpp @@ -746,8 +746,8 @@ void ctcubemask::save_fits(void) // Log filename if (logTerse()) { - log << "Save counts cube into file \""+m_outcube+"\"."; - log << std::endl; + log << gammalib::parformat("Counts cube file"); + log << m_outcube.url() << std::endl; } // Save event list @@ -802,8 +802,8 @@ void ctcubemask::save_xml(void) // Log filename if (logTerse()) { - log << "Save counts cube into file \""+outfile+"\"."; - log << std::endl; + log << gammalib::parformat("Counts cube file"); + log << outfile << std::endl; } // Save event list diff --git a/src/ctedispcube/ctedispcube.cpp b/src/ctedispcube/ctedispcube.cpp index 728ecb0..c728729 100644 --- a/src/ctedispcube/ctedispcube.cpp +++ b/src/ctedispcube/ctedispcube.cpp @@ -286,8 +286,8 @@ void ctedispcube::save(void) // Log filename if (logTerse()) { - log << "Save energy dispersion cube into file \""+m_outcube+"\"."; - log << std::endl; + log << gammalib::parformat("Energy dispersion cube file"); + log << m_outcube.url() << std::endl; } // Save energy dispersion cube diff --git a/src/ctexpcube/ctexpcube.cpp b/src/ctexpcube/ctexpcube.cpp index 1b88f0e..4b22314 100644 --- a/src/ctexpcube/ctexpcube.cpp +++ b/src/ctexpcube/ctexpcube.cpp @@ -297,8 +297,8 @@ void ctexpcube::save(void) // Log filename if (logTerse()) { - log << "Save exposure cube into file \""+m_outcube+"\"."; - log << std::endl; + log << gammalib::parformat("Exposure cube file"); + log << m_outcube.url() << std::endl; } // Save exposure cube @@ -332,7 +332,8 @@ void ctexpcube::publish(const std::string& name) // Log filename if (logTerse()) { - log << "Publish \""+user_name+"\" exposure cube." << std::endl; + log << gammalib::parformat("Publish exposure cube"); + log << user_name << std::endl; } // Publish exposure cube diff --git a/src/ctmodel/ctmodel.cpp b/src/ctmodel/ctmodel.cpp index c5c14cc..695b77d 100644 --- a/src/ctmodel/ctmodel.cpp +++ b/src/ctmodel/ctmodel.cpp @@ -356,8 +356,8 @@ void ctmodel::save(void) // Log filename if (logTerse()) { - log << "Save model cube into file \""+m_outcube+"\"."; - log << std::endl; + log << gammalib::parformat("Model cube file"); + log << m_outcube.url() << std::endl; } // Save model cube into FITS file @@ -391,7 +391,8 @@ void ctmodel::publish(const std::string& name) // Log filename if (logTerse()) { - log << "Publish \""+user_name+"\" model cube." << std::endl; + log << gammalib::parformat("Publish model cube"); + log << user_name << std::endl; } // Publish model cube diff --git a/src/ctpsfcube/ctpsfcube.cpp b/src/ctpsfcube/ctpsfcube.cpp index 3e0c664..89e3297 100644 --- a/src/ctpsfcube/ctpsfcube.cpp +++ b/src/ctpsfcube/ctpsfcube.cpp @@ -270,8 +270,8 @@ void ctpsfcube::save(void) // Log filename if (logTerse()) { - log << "Save PSF cube into file \""+m_outcube+"\"."; - log << std::endl; + log << gammalib::parformat("PSF cube file"); + log << m_outcube.url() << std::endl; } // Save PSF cube diff --git a/src/ctselect/ctselect.cpp b/src/ctselect/ctselect.cpp index 6b99fd4..6590a08 100644 --- a/src/ctselect/ctselect.cpp +++ b/src/ctselect/ctselect.cpp @@ -1266,8 +1266,8 @@ void ctselect::save_fits(void) // Log filename if (logTerse()) { - log << "Save event list into file \""+outfile+"\"."; - log << std::endl; + log << gammalib::parformat("Event list file"); + log << outfile << std::endl; } // Save event list @@ -1335,8 +1335,8 @@ void ctselect::save_xml(void) // Log filename if (logTerse()) { - log << "Save event list into file \""+outfile+"\"."; - log << std::endl; + log << gammalib::parformat("Event list file"); + log << outfile << std::endl; } // Store output file name in observation diff --git a/src/ctskymap/ctskymap.cpp b/src/ctskymap/ctskymap.cpp index 1b6fb7f..ee54e88 100644 --- a/src/ctskymap/ctskymap.cpp +++ b/src/ctskymap/ctskymap.cpp @@ -322,7 +322,8 @@ void ctskymap::save(void) // Log filename if (logTerse()) { - log << "Save sky map into file \""+m_outmap+"\"." << std::endl; + log << gammalib::parformat("Sky map file"); + log << m_outmap.url() << std::endl; } // Create empty FITS file @@ -362,7 +363,8 @@ void ctskymap::publish(const std::string& name) // Log filename if (logTerse()) { - log << "Publish \""+user_name+"\" sky map." << std::endl; + log << gammalib::parformat("Publish sky map"); + log << user_name << std::endl; } // Publish sky map diff --git a/src/cttsmap/cttsmap.cpp b/src/cttsmap/cttsmap.cpp index cca8a2a..27c3ff2 100644 --- a/src/cttsmap/cttsmap.cpp +++ b/src/cttsmap/cttsmap.cpp @@ -399,7 +399,8 @@ void cttsmap::save(void) // Log filename if (logTerse()) { - log << "Save TS map into file \""+m_outmap+"\"." << std::endl; + log << gammalib::parformat("TS map file"); + log << m_outmap.url() << std::endl; } // Create fits file @@ -453,7 +454,8 @@ void cttsmap::publish(const std::string& name) // Log filename if (logTerse()) { - log << "Publish \""+user_name+"\" TS map." << std::endl; + log << gammalib::parformat("Publish TS map"); + log << user_name << std::endl; } // Publish TS map diff --git a/test/test_ctbin.py b/test/test_ctbin.py index 8fe5532..abc0124 100755 --- a/test/test_ctbin.py +++ b/test/test_ctbin.py @@ -73,7 +73,8 @@ class Test(test): ' outcube="cntmap_cmd1.fits"'+\ ' emin=0.1 emax=100.0 enumbins=20 ebinalg="LOG"'+ \ ' nxpix=200 nypix=200 binsz=0.02 coordsys="CEL"'+ \ - ' xref=83.63 yref=22.01 proj="CAR"' + ' xref=83.63 yref=22.01 proj="CAR"'+ \ + ' logfile="ctbin_cmd1.log" chatter=1' # Check if execution of wrong command fails self.test_assert(self._execute('command_that_does_not_exist') != 0, @@ -92,7 +93,8 @@ class Test(test): ' outcube="cntmap_cmd2.fits"'+\ ' emin=0.1 emax=100.0 enumbins=20 ebinalg="LOG"'+ \ ' nxpix=200 nypix=200 binsz=0.02 coordsys="CEL"'+ \ - ' xref=83.63 yref=22.01 proj="CAR"' + ' xref=83.63 yref=22.01 proj="CAR"'+ \ + ' logfile="ctbin_cmd1.log" chatter=1' # Check if execution failed self.test_assert(self._execute(cmd) != 0, @@ -121,8 +123,11 @@ class Test(test): bin['proj'] = 'CAR' bin['xref'] = 83.63 bin['yref'] = 22.01 + bin['logfile'] = 'ctbin_py1.log' + bin['chatter'] = 2 # Run ctbin tool + bin.logFileOpen() # Make sure we get a log file bin.run() # Check content of observation and cube @@ -137,6 +142,8 @@ class Test(test): self._check_cube(cpy_bin.cube(), 5542) # Run copy of ctbin tool again + cpy_bin['logfile'] = 'ctbin_py2.log' + cpy_bin['chatter'] = 3 cpy_bin.run() # Check content of observation and cube. We expect now an empty @@ -177,8 +184,11 @@ class Test(test): bin['proj'] = 'CAR' bin['xref'] = 83.63 bin['yref'] = 22.01 + bin['logfile'] = 'ctbin_py3.log' + bin['chatter'] = 4 # Run ctbin tool + bin.logFileOpen() # Make sure we get a log file bin.run() # Check content of observation and cube (need multiplier=3 since @@ -200,6 +210,8 @@ class Test(test): bin['proj'] = 'CAR' bin['xref'] = 83.63 bin['yref'] = 22.01 + bin['logfile'] = 'ctbin_py4.log' + bin['chatter'] = 4 # Execute ctbin tool bin.execute()