publish global in ctool

jean perrot
1 parent d1ef7990
Showing 6 changed files with 59 additions and 17 deletions
cscripts/csviscube.py
pyext/ctool.i
src/support/ctobservation.cpp
src/support/ctobservation.hpp
src/support/ctool.cpp
src/support/ctool.hpp
@@ -494,20 +494,6 @@ class csviscube(ctools.cscript):
         name : str, optional
             Name of visibility cube
         """
-        # Write header
-        # self._log_header1(gammalib.TERSE, 'Publish visibility cube')
-
-        # Set default name is user name is empty
-        # if not name:
-        #     user_name = self._name
-        # else:
-        #     user_name = name
-
-        # Log cube name
-        # self._log_value(gammalib.TERSE, 'Visibility cube name', user_name)
-
-        # Publish cube
-        # self._cube.publish(user_name)
  
         self._publish_map(name, "", "Publish visibility cube", self._cube)
  
@@ -112,11 +112,13 @@ public:
     %rename(_warn_too_few_energies)    warn_too_few_energies;
     %rename(_warn_xml_suffix)          warn_xml_suffix;
     %rename(_publish_map)              publish_map;
+    %rename(_publish_events_list)      publish_events_list;
  
     // Protected methods
     const bool&           read_ahead(void) const;
     const GTimeReference& time_reference(void) const;
     void publish_map(const std::string& name, std::string defautName, std::string typePub, const GSkyMap& pub);
+    void publish_events_list(const std::string& name, std::string defautName);
  
     // Protected high-level setup methods
     void setup_observations(GObservations& obs, const bool& response = true,
@@ -452,7 +452,7 @@ void ctobservation::save_events_xml(void)
  *
  * @param[in] name Event list name, default name
  ***************************************************************************/
-void ctobservation::publish_events_list(const std::string& name, std::string DefaultName)
+/*void ctobservation::publish_events_list(const std::string& name, std::string DefaultName)
 {
     // Write header into logger
     log_header1(TERSE, gammalib::number("Publish event list", m_obs.size()));
@@ -498,4 +498,4 @@ void ctobservation::publish_events_list(const std::string&amp; name, std::string Def
  
     // Return
     return;
-}
+}*/
@@ -80,7 +80,7 @@ protected:
     void free_members(void);
     void save_events_fits(void);
     void save_events_xml(void);
-    void publish_events_list(const std::string& name, std::string defautName);
+    // void publish_events_list(const std::string& name, std::string defautName);
  
     // Protected members
  
@@ -2079,3 +2079,56 @@ void ctool::publish_map(const std::string&amp; name, std::string defautName, std::st
     // Return
     return;
 }
+
+/***********************************************************************//**
+ * @brief Publish event lists
+ *
+ * @param[in] name Event list name, default name
+ ***************************************************************************/
+void ctool::publish_events_list(const std::string& name, std::string DefaultName)
+{
+    // Write header into logger
+    log_header1(TERSE, gammalib::number("Publish event list", m_obs.size()));
+
+    // Loop over all observation in the container
+    for (int i = 0; i < m_obs.size(); ++i) {
+
+        // Get CTA observation
+        GCTAObservation* obs = dynamic_cast<GCTAObservation*>(m_obs[i]);
+
+        // Handle only CTA observations
+        if (obs != NULL) {
+
+            // Continue only if there is an event list
+            if (obs->events()->size() != 0) {
+
+                // Set default name if user name is empty
+                std::string user_name(name);
+                if (user_name.empty()) {
+                    user_name = DefaultName;
+                }
+
+                // If there are several event lists then add an index
+                if (m_use_xml) {
+                    user_name += gammalib::str(i);
+                }
+
+                // Write event list name into logger
+                log_value(NORMAL, "Event list name", user_name);
+
+                // Write events into in-memory FITS file
+                GFits fits;
+                obs->write(fits);
+
+                // Publish
+                fits.publish(gammalib::extname_cta_events, user_name);
+
+            } // endif: there were events
+
+        } // endif: observation was a CTA observation
+
+    } // endfor: looped over observations
+
+    // Return
+    return;
+}
@@ -80,6 +80,7 @@ protected:
     const bool&           read_ahead(void) const;
     const GTimeReference& time_reference(void) const;
     void publish_map(const std::string& name, std::string defautName, std::string typePub, const GSkyMap& pub);
+    void publish_events_list(const std::string& name, std::string defautName);
  
     // Protected high-level setup methods
     void setup_observations(GObservations& obs, const bool& response = true,