Do not allow counts cube as inobs for ctbin, ctexpcube, ctpsfcube and ctbkgcube.

Added ctool::require_inobs_nocube() method that throws an exception if a counts cube has been specified as inobs parameter. This method is then used by ctbin, ctexpcube, ctpsfcube and ctbkgcube.

Do not allow counts cube as inobs for ctbin, ctexpcube, ctpsfcube and ctbkgcube.
Added ctool::require_inobs_nocube() method that throws an exception if a counts cube has been specified as inobs parameter. This method is then used by ctbin, ctexpcube, ctpsfcube and ctbkgcube.
Jürgen Knödlseder
1 parent eb60348d
Showing 7 changed files with 76 additions and 5 deletions
pyext/ctool.i
src/ctbin/ctbin.cpp
src/ctbkgcube/ctbkgcube.cpp
src/ctexpcube/ctexpcube.cpp
src/ctpsfcube/ctpsfcube.cpp
src/support/ctool.cpp
src/support/ctool.hpp
@@ -99,6 +99,7 @@ public:
  
     // Protected methods that check user parameters
     void            require_inobs(const std::string& method);
+    void            require_inobs_nocube(const std::string& method);
  
     // Protected support methods
     void            set_response(GObservations& obs);
@@ -434,6 +434,9 @@ void ctbin::get_parameters(void)
         // Throw exception if no input observation file is given
         require_inobs(G_GET_PARAMETERS);
  
+        // Throw exception if counts cube is given
+        require_inobs_nocube(G_GET_PARAMETERS);
+
         // Get observation container without response (not needed)
         m_obs = get_observations(false);
  
@@ -450,6 +450,9 @@ void ctbkgcube::get_parameters(void)
         // Throw exception if no input observation file is given
         require_inobs(G_GET_PARAMETERS);
  
+        // Throw exception if counts cube is given
+        require_inobs_nocube(G_GET_PARAMETERS);
+
         // Build observation container
         m_obs = get_observations();
  
@@ -354,6 +354,9 @@ void ctexpcube::get_parameters(void)
         // Throw exception if no input observation file is given
         require_inobs(G_GET_PARAMETERS);
  
+        // Throw exception if counts cube is given
+        require_inobs_nocube(G_GET_PARAMETERS);
+
         // Build observation container
         m_obs = get_observations();
  
@@ -353,6 +353,9 @@ void ctpsfcube::get_parameters(void)
         // Throw exception if no input observation file is given
         require_inobs(G_GET_PARAMETERS);
  
+        // Throw exception if counts cube is given
+        require_inobs_nocube(G_GET_PARAMETERS);
+
         // Build observation container
         m_obs = get_observations();
  
@@ -656,18 +656,23 @@ GCTAObservation ctool::create_cta_obs(void)
  
  
 /***********************************************************************//**
- * @brief Throws exception in inobs parameter is not valid
+ * @brief Throws exception if inobs parameter is not valid
  *
  * @param[in] method Method name.
+ *
+ * Throw an exception if the inobs parameter is either NONE or an empty
+ * string.
  ***************************************************************************/
 void ctool::require_inobs(const std::string& method)
 {
+    // Get inobs filename
+    std::string filename = (*this)["inobs"].filename();
+
     // Throw exception if no infile is given
-    if ((*this)["inobs"].filename() == "NONE" ||
-        (*this)["inobs"].filename() == "") {
+    if (filename == "NONE" || gammalib::strip_whitespace(filename) == "") {
         std::string msg = "A valid file needs to be specified for the "
-                          "\"inobs\" parameter, yet \""+
-                          (*this)["inobs"].filename()+"\" was given."
+                          "\"inobs\" parameter, yet \""+filename+
+                          "\" was given."
                           " Specify a valid observation definition or "
                           "FITS file to proceed.";
         throw GException::invalid_value(method, msg);
@@ -679,6 +684,58 @@ void ctool::require_inobs(const std::string&amp; method)
  
  
 /***********************************************************************//**
+ * @brief Throws exception if inobs parameter is a counts cube
+ *
+ * @param[in] method Method name.
+ *
+ * Throw an exception if the inobs parameter is a counts cube.
+ ***************************************************************************/
+void ctool::require_inobs_nocube(const std::string& method)
+{
+    // Get inobs filename
+    std::string filename = (*this)["inobs"].filename();
+
+    // Continue only if we have a FITS file
+    if (gammalib::is_fits(filename)) {
+
+        // Signal su
+        bool is_cube = false;
+    
+        // Try loading file as counts cube. If this is successful then
+        // throw an exception
+        try {
+
+            // Load cube from file
+            GCTAEventCube cube(filename);
+
+            // If we're still alive then signal that we have a cube
+            is_cube = true;
+
+        }
+
+        // Catch any exceptions
+        catch (...) {
+            ;
+        }
+
+        // If we have a counts cube then throw an exception
+        if (is_cube) {
+            std::string msg = "A counts cube has been specified for the "
+                              "\"inobs\" parameter, yet no counts cube "
+                              "can be specified as input observation."
+                              " Instead, specify an event list or an "
+                              "observation definition file.";
+            throw GException::invalid_value(method, msg);
+        }
+    
+    } // endif: we had a FITS file
+    
+    // Return
+    return;
+}
+
+
+/***********************************************************************//**
  * @brief Set response for all CTA observations in container
  *
  * @param[in,out] obs Observation container
@@ -81,6 +81,7 @@ protected:
  
     // Protected methods that check user parameters
     void            require_inobs(const std::string& method);
+    void            require_inobs_nocube(const std::string& method);
  
     // Protected support methods
     void            set_response(GObservations& obs);