From 4e47b21b0a09aeff94e1035a72979fadef537f92 Mon Sep 17 00:00:00 2001 From: Jürgen Knödlseder Date: Sat, 21 Jul 2012 01:05:28 +0200 Subject: [PATCH] Change parameter access methods. --- src/ctbin/ctbin.cpp | 10 +++++----- src/ctbin/ctbin.hpp | 2 +- src/ctobssim/ctobssim.cpp | 10 +++++----- src/ctselect/ctselect.cpp | 10 +++++----- src/ctselect/ctselect.hpp | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/ctbin/ctbin.cpp b/src/ctbin/ctbin.cpp index 53095b6..71be259 100644 --- a/src/ctbin/ctbin.cpp +++ b/src/ctbin/ctbin.cpp @@ -441,8 +441,8 @@ void ctbin::get_parameters(void) // Optionally read ahead parameters so that they get correctly // dumped into the log file if (m_read_ahead) { - m_outfile = (*this)["outfile"].value(); - m_prefix = (*this)["prefix"].value(); + m_outfile = (*this)["outfile"].filename(); + m_prefix = (*this)["prefix"].string(); } // Return @@ -710,7 +710,7 @@ std::string ctbin::set_outfile_name(const std::string& filename) const void ctbin::save_fits(void) { // Get output filename - m_outfile = (*this)["outfile"].value(); + m_outfile = (*this)["outfile"].filename(); // Get CTA observation from observation container GCTAObservation* obs = dynamic_cast(&m_obs[0]); @@ -737,8 +737,8 @@ void ctbin::save_fits(void) void ctbin::save_xml(void) { // Get output filename and prefix - m_outfile = (*this)["outfile"].value(); - m_prefix = (*this)["prefix"].value(); + m_outfile = (*this)["outfile"].filename(); + m_prefix = (*this)["prefix"].string(); // Loop over all observation in the container for (int i = 0; i < m_obs.size(); ++i) { diff --git a/src/ctbin/ctbin.hpp b/src/ctbin/ctbin.hpp index c945890..d0016b6 100644 --- a/src/ctbin/ctbin.hpp +++ b/src/ctbin/ctbin.hpp @@ -33,7 +33,7 @@ /* __Definitions _________________________________________________________ */ #define CTBIN_NAME "ctbin" -#define CTBIN_VERSION "00-03-00" +#define CTBIN_VERSION "00-03-01" /***********************************************************************//** diff --git a/src/ctobssim/ctobssim.cpp b/src/ctobssim/ctobssim.cpp index f09ca95..afed34b 100644 --- a/src/ctobssim/ctobssim.cpp +++ b/src/ctobssim/ctobssim.cpp @@ -414,8 +414,8 @@ void ctobssim::get_parameters(void) // Optionally read ahead parameters so that they get correctly // dumped into the log file if (m_read_ahead) { - m_outfile = (*this)["outfile"].value(); - m_prefix = (*this)["prefix"].value(); + m_outfile = (*this)["outfile"].filename(); + m_prefix = (*this)["prefix"].string(); } // Initialise random number generator @@ -909,7 +909,7 @@ void ctobssim::free_members(void) void ctobssim::save_fits(void) { // Get output filename - m_outfile = (*this)["outfile"].value(); + m_outfile = (*this)["outfile"].filename(); // Get CTA observation from observation container GCTAObservation* obs = dynamic_cast(&m_obs[0]); @@ -935,8 +935,8 @@ void ctobssim::save_fits(void) void ctobssim::save_xml(void) { // Get output filename and prefix - m_outfile = (*this)["outfile"].value(); - m_prefix = (*this)["prefix"].value(); + m_outfile = (*this)["outfile"].filename(); + m_prefix = (*this)["prefix"].string(); // Initialise file number int file_num = 0; diff --git a/src/ctselect/ctselect.cpp b/src/ctselect/ctselect.cpp index 0454b23..45ed9e9 100644 --- a/src/ctselect/ctselect.cpp +++ b/src/ctselect/ctselect.cpp @@ -439,8 +439,8 @@ void ctselect::get_parameters(void) // Optionally read ahead parameters so that they get correctly // dumped into the log file if (m_read_ahead) { - m_outfile = (*this)["outfile"].value(); - m_prefix = (*this)["prefix"].value(); + m_outfile = (*this)["outfile"].filename(); + m_prefix = (*this)["prefix"].string(); } // Derive time interval @@ -835,7 +835,7 @@ std::string ctselect::set_outfile_name(const std::string& filename) const void ctselect::save_fits(void) { // Get output filename - m_outfile = (*this)["outfile"].value(); + m_outfile = (*this)["outfile"].filename(); // Get CTA observation from observation container GCTAObservation* obs = dynamic_cast(&m_obs[0]); @@ -861,8 +861,8 @@ void ctselect::save_fits(void) void ctselect::save_xml(void) { // Get output filename and prefix - m_outfile = (*this)["outfile"].value(); - m_prefix = (*this)["prefix"].value(); + m_outfile = (*this)["outfile"].filename(); + m_prefix = (*this)["prefix"].string(); // Loop over all observation in the container for (int i = 0; i < m_obs.size(); ++i) { diff --git a/src/ctselect/ctselect.hpp b/src/ctselect/ctselect.hpp index e222402..5302816 100644 --- a/src/ctselect/ctselect.hpp +++ b/src/ctselect/ctselect.hpp @@ -35,7 +35,7 @@ /* __Definitions _________________________________________________________ */ #define CTSELECT_NAME "ctselect" -#define CTSELECT_VERSION "00-03-00" +#define CTSELECT_VERSION "00-03-01" /***********************************************************************//** -- libgit2 0.21.4