Implement handling of instrument specific scale factors.

The read() and write() methods now handle the reading and writing of instrument specific model scale factors. The spatial() method uses the scale factors to scale the IRF accordingly, if required.

Implement handling of instrument specific scale factors.
The read() and write() methods now handle the reading and writing of instrument specific model scale factors. The spatial() method uses the scale factors to scale the IRF accordingly, if required.
Jürgen Knödlseder
1 parent d61e970c
Showing 1 changed file with 18 additions and 2 deletions
src/model/GModelSky.cpp
 /***************************************************************************
  *             GModelSky.cpp  -  Abstract sky model base class             *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2011-2012 by Juergen Knoedlseder                         *
+ *  copyright (C) 2011-2013 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -428,6 +428,9 @@ void GModelSky::read(const GXmlElement&amp; xml)
     // Set instruments
     instruments(xml.attribute("instrument"));
+    // Read instrument scales
+    read_scales(xml);
+
     // Set observation identifiers
     ids(xml.attribute("id"));
@@ -465,7 +468,7 @@ void GModelSky::write(GXmlElement&amp; xml) const
         src->attribute("name") = name();
         if (spectral() != NULL) src->append(new GXmlElement("spectrum"));
         if (spatial()  != NULL) src->append(new GXmlElement("spatialModel"));
-        xml.append(src);
+        xml.append(src); // Appends pointer
     }
     // Set model attributes
@@ -488,6 +491,9 @@ void GModelSky::write(GXmlElement&amp; xml) const
         spatial()->write(*spat);
     }
+    // Write instrument scales
+    write_scales(*src);
+
     // Return
     return;
 }
@@ -815,6 +821,11 @@ GModelTemporal* GModelSky::xml_temporal(const GXmlElement&amp; temporal) const
  *
  * This method computes the spatial model component for a given true photon
  * energy and arrival time.
+ *
+ * The method takes care of any instrument dependent scale factors. These
+ * scale factors will be applied to the IRF so that they are correctly
+ * taken into account in the spectral and temporal model gradient
+ * computations.
  ***************************************************************************/
 double GModelSky::spatial(const GEvent& event,
                           const GEnergy& srcEng, const GTime& srcTime,
@@ -839,6 +850,11 @@ double GModelSky::spatial(const GEvent&amp; event,
         // source model.
         double irf = rsp->irf(event, source, obs);
+        // If required, apply instrument specific model scaling
+        if (!m_scales.empty()) {
+            irf *= scale(obs.instrument()).real_value();
+        }
+
         // Case A: evaluate gradients
         if (grad) {