Change parameter access methods.

Filenames are now always accessed using the filename() method so that environment variables get correctly expanded. The prefix is now accessed using the string() method instead of the generic value() method, so that string checkings can be performed.

Change parameter access methods.
Filenames are now always accessed using the filename() method so that environment variables get correctly expanded. The prefix is now accessed using the string() method instead of the generic value() method, so that string checkings can be performed.
Jürgen Knödlseder
1 parent d4811766
Showing 5 changed files with 17 additions and 17 deletions
src/ctbin/ctbin.cpp
src/ctbin/ctbin.hpp
src/ctobssim/ctobssim.cpp
src/ctselect/ctselect.cpp
src/ctselect/ctselect.hpp
@@ -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&amp; 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<GCTAObservation*>(&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) {
@@ -33,7 +33,7 @@
 /* __Definitions _________________________________________________________ */
 #define CTBIN_NAME    "ctbin"
-#define CTBIN_VERSION "00-03-00"
+#define CTBIN_VERSION "00-03-01"
 /***********************************************************************//**
@@ -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<GCTAObservation*>(&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;
@@ -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&amp; 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<GCTAObservation*>(&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) {
@@ -35,7 +35,7 @@
 /* __Definitions _________________________________________________________ */
 #define CTSELECT_NAME    "ctselect"
-#define CTSELECT_VERSION "00-03-00"
+#define CTSELECT_VERSION "00-03-01"
 /***********************************************************************//**