Added critical statement in GCTAObservation (#2192)

Added OpenMP critical wrapper to GCTAObservation::load() to prevent loading multiple files simultaneously Updated GCTAEventList to wrap testing of the fits file (#2192)

Added critical statement in GCTAObservation (#2192)
Added OpenMP critical wrapper to GCTAObservation::load() to prevent loading multiple files simultaneously Updated GCTAEventList to wrap testing of the fits file (#2192)
Jürgen Knödlseder
1 parent b1d2c005
Showing 4 changed files with 22 additions and 26 deletions
ChangeLog
doc/source/admin/release_history/1.4.3.rst
inst/cta/src/GCTAEventList.cpp
inst/cta/src/GCTAObservation.cpp
@@ -4,7 +4,8 @@
         ================================
  
         Correct background interpolation in GCTACubeBackground::operator() (#2268)
-        Correct GModelSpatialComposite::copy_members() bug.
+        Fix OpenMP segfault issue when fetching CTA events (#2192)
+        Correct GModelSpatialComposite::copy_members() bug
  
  
 2017-08-24
@@ -12,4 +12,6 @@ The following bugs have been fixed:
  
 * [`2268 <https://cta-redmine.irap.omp.eu/issues/2268>`_] -
   Correct background interpolation in ``GCTACubeBackground::operator()``
+* [`2192 <https://cta-redmine.irap.omp.eu/issues/2192>`_] -
+  Fix OpenMP segfault issue when fetching CTA events
 * Correct bug in ``GModelSpatialComposite::copy_members()``
@@ -705,14 +705,6 @@ void GCTAEventList::fetch(void) const
         // Continue only if the file name is not empty
         if (!m_filename.is_empty()) {
  
-            // Throw an exception if the file does not exist
-            if (!m_filename.exists()) {
-                std::string msg = "File \""+m_filename+"\" not found. "
-                                  "Cannot fetch events. Maybe the file has "
-                                  "been deleted in the meantime.";
-                GException::file_error(G_FETCH, msg);
-            }
-
             // Initialise exception flag
             bool has_exception = false;
  
@@ -721,19 +713,18 @@ void GCTAEventList::fetch(void) const
             #pragma omp critical(GCTAEventList_fetch)
             {
             try {
-
                 // Open FITS file
                 GFits fits(m_filename);
-
+                
                 // Initialise events extension name
                 std::string extname = fits.filename().extname(gammalib::extname_cta_events);
-
+                
                 // Get event list HDU
                 const GFitsTable& events = *fits.table(extname);
-
+                
                 // Load event data
                 read_events(events);
-
+                
                 // Close FITS file
                 fits.close();
  
@@ -1132,18 +1132,20 @@ void GCTAObservation::write(GFits&amp; fits, const std::string&amp; evtname,
  ***************************************************************************/
 void GCTAObservation::load(const GFilename& filename)
 {
-    // Store event filename
-    m_eventfile = filename;
-
-    // Open FITS file
-    GFits fits(filename);
-
-    // Read data
-    read(fits);
-
-    // Close FITS file
-    fits.close();
-
+    #pragma omp critical(GCTAObservation_load)
+    {
+        // Store event filename
+        m_eventfile = filename;
+        
+        // Open FITS file
+        GFits fits(filename);
+        
+        // Read data
+        read(fits);
+        
+        // Close FITS file
+        fits.close();
+    }
     // Return
     return;
 }