Fix response cache removal for vector cache (#3499)

Jürgen Knödlseder
1 parent 80f09635
Showing 10 changed files with 31 additions and 41 deletions
ChangeLog
NEWS
README.md
doc/source/admin/release_history/2.0.rst
inst/com/src/GCOMObservation.cpp
inst/cta/include/GCTAObservation.hpp
inst/cta/pyext/GCTAObservation.i
inst/cta/src/GCTAObservation.cpp
src/obs/GObservation.cpp
src/obs/GResponse.cpp
-2020-12-02
+2021-01-14
  
         * Version 2.0.0 released
         ========================
  
+        Fix response cache removal for vector cache (#3499)
         Add GModelAssociation and GModelAssociations classes (#3469)
         Add GSkyMap::correlate() method (#3461)
         Add GModels::eval() vector evaluation method (#3455)
 New Features and Important Changes in GammaLib 2.0.0
  
-2 December 2020
+14 January 2021
  
  
 1. Introduction
@@ -136,6 +136,9 @@ of functions (#3328).
  
 10. Observation module
 ----------------------
+Add source removal from vector cache to GResponse::remove_response_cache()
+method (#3499).
+
 The GResponseVectorCache class was added to handle caching of the vector response.
 Only non-zero IRF values are stored by the class. The class was integrated in the
 GResponse class (#3403).
 GammaLib information
 ====================
-* Version: 2.0.0.dev (2 December 2020)
+* Version: 2.0.0.dev (14 January 2021)
  
 [![Build Status](https://cta-jenkins.irap.omp.eu/buildStatus/icon?job=gammalib-integrate-os)](https://cta-jenkins.irap.omp.eu/job/gammalib-integrate-os/)
  
 .. _2.0:
  
-GammaLib 2.0 release (27 November 2020)
-=======================================
+GammaLib 2.0 release (14 January 2021)
+======================================
  
 Overview
 --------
@@ -17,6 +17,8 @@ In particular, this release provides:
 Bug fixes
 ---------
  
+* [`3499 <https://cta-redmine.irap.omp.eu/issues/3499>`_] -
+  Fix response cache removal for vector cache
 * Fix ``GSkyMap::stack_maps()`` method for WCS maps
 * [`3417 <https://cta-redmine.irap.omp.eu/issues/3417>`_] -
   Correct application elapsed CPU time for OpenMP
 /***************************************************************************
  *             GCOMObservation.cpp - COMPTEL Observation class             *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2012-2020 by Juergen Knoedlseder                         *
+ *  copyright (C) 2012-2021 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -734,6 +734,12 @@ void GCOMObservation::remove_response_cache(const std::string&amp; name)
         m_drms.erase(m_drms.begin()+index);
     }
  
+    // Build model name
+    std::string model_name  = id() + ":" + name;
+
+    // Remove response cache
+    const_cast<GCOMResponse*>(this->response())->remove_response_cache(model_name);
+
     // Return
     return;
 }
 /***************************************************************************
  *                GCTAObservation.hpp - CTA Observation class              *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2010-2019 by Juergen Knoedlseder                         *
+ *  copyright (C) 2010-2021 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -97,9 +97,6 @@ public:
     virtual void                write(GXmlElement& xml) const;
     virtual std::string         print(const GChatter& chatter = NORMAL) const;
  
-    // Implement virtual methods
-    virtual void                remove_response_cache(const std::string& name);
-
     // Other methods
     void                instrument(const std::string& instrument);
     bool                has_response(void) const;
 /***************************************************************************
  *          GCTAObservation.i - CTA Observation class interface            *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2010-2019 by Juergen Knoedlseder                         *
+ *  copyright (C) 2010-2021 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -64,9 +64,6 @@ public:
     virtual void                read(const GXmlElement& xml);
     virtual void                write(GXmlElement& xml) const;
  
-    // Implement virtual methods
-    virtual void                remove_response_cache(const std::string& name);
-
     // Other methods
     void                instrument(const std::string& instrument);
     bool                has_response(void) const;
 /***************************************************************************
  *                GCTAObservation.cpp - CTA Observation class              *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2010-2019 by Juergen Knoedlseder                         *
+ *  copyright (C) 2010-2021 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -1419,26 +1419,6 @@ void GCTAObservation::dispose_events(void)
  
  
 /***********************************************************************//**
- * @brief Remove response cache for model
- *
- * @param[in] name Model name.
- *
- * Remove response cache for model @p name from response cache.
- ***************************************************************************/
-void GCTAObservation::remove_response_cache(const std::string& name)
-{
-    // Build model name
-    std::string model_name  = id() + "::" + name;
-
-    // Remove response cache
-    const_cast<GCTAResponse*>(this->response())->remove_response_cache(model_name);
-
-    // Return
-    return;
-}
-
-
-/***********************************************************************//**
  * @brief Print CTA observation information
  *
  * @param[in] chatter Chattiness.
 /***************************************************************************
  *            GObservation.cpp - Abstract observation base class           *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2008-2020 by Juergen Knoedlseder                         *
+ *  copyright (C) 2008-2021 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -1181,13 +1181,16 @@ double GObservation::npred_grad(const GModel&amp; model, const GModelPar&amp; par) const
  *
  * @param[in] name Model name.
  *
- * This is a response cache removal hook that is called by the
- * GObservations::remove_response_cache() methods and that can be used to
- * remove the model @p name from a response cache, if implemented in the
- * derived class.
+ * Remove response cache for model @p name from response cache.
  ***************************************************************************/
 void GObservation::remove_response_cache(const std::string& name)
 {
+    // Build model name
+    std::string model_name  = id() + ":" + name;
+
+    // Remove response cache
+    const_cast<GResponse*>(this->response())->remove_response_cache(model_name);
+
     // Return
     return;
 }
 /***************************************************************************
  *                GResponse.cpp - Abstract response base class             *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2008-2020 by Juergen Knoedlseder                         *
+ *  copyright (C) 2008-2021 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -736,6 +736,7 @@ void GResponse::remove_response_cache(const std::string&amp; name)
     // Remove model from response caches
     m_irf_cache.remove(name);
     m_nroi_cache.remove(name);
+    m_irf_vector_cache.remove(name);
  
     // Return
     return;