Francois Brun / gammalib

Commit 480358493ddac2e4f1e7faf643b444318c804f96

Authored by Jürgen Knödlseder
1 parent b3f7d5b4

Use empty GTime() object as default time arguments in GModelSpectral eval() and … 

…eval_gradients() methods.
Inline Side-by-side
Showing 37 changed files with 172 additions and 108 deletions
ChangeLog
  View file @4803584
1   -2016-02-17 Juergen Knoedlseder <jurgen.knodlseder@irap.omp.eu>
  1 +2016-02-18 Juergen Knoedlseder <jurgen.knodlseder@irap.omp.eu>
2 2  
3 3 * Version 1.1.0 released
4 4 =========================
5 5  
  6 + Use default GTime in GModelSpectral eval() and eval_gradients() methods (#1672)
6 7 Optimise GModelSpatialDiffuseMap::set_mc_cone() method (#1673)
7 8 Optimise GModelSpatialDiffuseCube::set_mc_cone() method (#1673)
8 9 Use default GTime in GObservation::deadc() method (#1670)
... ...
... ... @@ -2,7 +2,7 @@ New Features and Important Changes in GammaLib 1.1.0
2 2  
3 3 Author(s) : Juergen Knoedlseder
4 4  
5   -17 February 2016
  5 +18 February 2016
6 6  
7 7  
8 8 1. Introduction
... ... @@ -111,6 +111,11 @@ None
111 111  
112 112 8. Model module
113 113 ---------------
  114 +The GModelSpectral eval() and eval_gradients() methods use an empty GTim()
  115 +object as default time argument since all spectral models are so far time-
  116 +independent. This avoids that a user needs to specify a dummy time argument
  117 +(#1672).
  118 +
114 119 The set_mc_cone() methods of the GModelSpatialDiffuseCube class and the
115 120 GModelSpatialDiffuseMap class now recompute only the Monte Carlo acceptance
116 121 cone in case that the cone centre or radius have changed since the last
... ...
include/GModelSpectral.hpp
  View file @4803584
1 1 /***************************************************************************
2 2 * GModelSpectral.hpp - Abstract spectral model base class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2009-2015 by Juergen Knoedlseder *
  4 + * copyright (C) 2009-2016 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -31,11 +31,13 @@
31 31 #include <string>
32 32 #include <vector>
33 33 #include "GBase.hpp"
34   -#include "GModelPar.hpp"
35   -#include "GEnergy.hpp"
36 34 #include "GTime.hpp"
37   -#include "GRan.hpp"
38   -#include "GXmlElement.hpp"
  35 +
  36 +/* __ Forward declaration ________________________________________________ */
  37 +class GEnergy;
  38 +class GRan;
  39 +class GModelPar;
  40 +class GXmlElement;
39 41  
40 42  
41 43 /***********************************************************************//**
... ... @@ -51,8 +53,8 @@
51 53 * \f]
52 54 *
53 55 * where
54   - * - \f$E\f$ is the true photon energy, and
55   - * - \f$t\f$ is the true photon arrival time.
  56 + * \f$E\f$ is the true photon energy, and
  57 + * \f$t\f$ is the true photon arrival time.
56 58 *
57 59 * The spectral component describes the spatially integrated time dependent
58 60 * spectral distribution of the source. It satisfies
... ... @@ -84,9 +86,9 @@ public:
84 86 virtual std::string classname(void) const = 0;
85 87 virtual std::string type(void) const = 0;
86 88 virtual double eval(const GEnergy& srcEng,
87   - const GTime& srcTime) const = 0;
  89 + const GTime& srcTime = GTime()) const = 0;
88 90 virtual double eval_gradients(const GEnergy& srcEng,
89   - const GTime& srcTime) = 0;
  91 + const GTime& srcTime = GTime()) = 0;
90 92 virtual double flux(const GEnergy& emin,
91 93 const GEnergy& emax) const = 0;
92 94 virtual double eflux(const GEnergy& emin,
... ...
include/GModelSpectralBrokenPlaw.hpp
  View file @4803584
1 1 /***************************************************************************
2 2 * GModelSpectralBrokenPlaw.hpp - Broken power law spectrum class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2013-2014 by Anneli Schulz *
  4 + * copyright (C) 2013-2016 by Anneli Schulz *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -29,10 +29,14 @@
29 29  
30 30 /* __ Includes ___________________________________________________________ */
31 31 #include <string>
32   -#include "GModelPar.hpp"
33 32 #include "GModelSpectral.hpp"
  33 +#include "GModelPar.hpp"
34 34 #include "GEnergy.hpp"
35   -#include "GXmlElement.hpp"
  35 +
  36 +/* __ Forward declarations _______________________________________________ */
  37 +class GRan;
  38 +class GTime;
  39 +class GXmlElement;
36 40  
37 41  
38 42 /***********************************************************************//**
... ... @@ -75,9 +79,9 @@ public:
75 79 virtual std::string classname(void) const;
76 80 virtual std::string type(void) const;
77 81 virtual double eval(const GEnergy& srcEng,
78   - const GTime& srcTime) const;
  82 + const GTime& srcTime = GTime()) const;
79 83 virtual double eval_gradients(const GEnergy& srcEng,
80   - const GTime& srcTime);
  84 + const GTime& srcTime = GTime());
81 85 virtual double flux(const GEnergy& emin,
82 86 const GEnergy& emax) const;
83 87 virtual double eflux(const GEnergy& emin,
... ...
include/GModelSpectralConst.hpp
  View file @4803584
1 1 /***************************************************************************
2 2 * GModelSpectralConst.hpp - Spectral constant model class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2009-2014 by Juergen Knoedlseder *
  4 + * copyright (C) 2009-2016 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -29,10 +29,14 @@
29 29  
30 30 /* __ Includes ___________________________________________________________ */
31 31 #include <string>
32   -#include "GModelPar.hpp"
33 32 #include "GModelSpectral.hpp"
  33 +#include "GModelPar.hpp"
34 34 #include "GEnergy.hpp"
35   -#include "GXmlElement.hpp"
  35 +
  36 +/* __ Forward declarations _______________________________________________ */
  37 +class GRan;
  38 +class GTime;
  39 +class GXmlElement;
36 40  
37 41  
38 42 /***********************************************************************//**
... ... @@ -69,9 +73,9 @@ public:
69 73 virtual std::string classname(void) const;
70 74 virtual std::string type(void) const;
71 75 virtual double eval(const GEnergy& srcEng,
72   - const GTime& srcTime) const;
  76 + const GTime& srcTime = GTime()) const;
73 77 virtual double eval_gradients(const GEnergy& srcEng,
74   - const GTime& srcTime);
  78 + const GTime& srcTime = GTime());
75 79 virtual double flux(const GEnergy& emin,
76 80 const GEnergy& emax) const;
77 81 virtual double eflux(const GEnergy& emin,
... ...
include/GModelSpectralExpPlaw.hpp
  View file @4803584
1 1 /***************************************************************************
2 2 * GModelSpectralExpPlaw.hpp - Exponential cut off power law model *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2010-2015 by Juergen Knoedlseder *
  4 + * copyright (C) 2010-2016 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -29,11 +29,15 @@
29 29  
30 30 /* __ Includes ___________________________________________________________ */
31 31 #include <string>
32   -#include "GModelPar.hpp"
33 32 #include "GModelSpectral.hpp"
34   -#include "GEnergy.hpp"
35   -#include "GXmlElement.hpp"
36 33 #include "GFunction.hpp"
  34 +#include "GModelPar.hpp"
  35 +#include "GEnergy.hpp"
  36 +
  37 +/* __ Forward declarations _______________________________________________ */
  38 +class GRan;
  39 +class GTime;
  40 +class GXmlElement;
37 41  
38 42  
39 43 /***********************************************************************//**
... ... @@ -78,9 +82,9 @@ public:
78 82 virtual std::string classname(void) const;
79 83 virtual std::string type(void) const;
80 84 virtual double eval(const GEnergy& srcEng,
81   - const GTime& srcTime) const;
  85 + const GTime& srcTime = GTime()) const;
82 86 virtual double eval_gradients(const GEnergy& srcEng,
83   - const GTime& srcTime);
  87 + const GTime& srcTime = GTime());
84 88 virtual double flux(const GEnergy& emin,
85 89 const GEnergy& emax) const;
86 90 virtual double eflux(const GEnergy& emin,
... ...
include/GModelSpectralFunc.hpp
  View file @4803584
... ... @@ -30,13 +30,17 @@
30 30 /* __ Includes ___________________________________________________________ */
31 31 #include <vector>
32 32 #include <string>
33   -#include "GModelPar.hpp"
34 33 #include "GModelSpectral.hpp"
  34 +#include "GModelPar.hpp"
35 35 #include "GEnergy.hpp"
36   -#include "GXmlElement.hpp"
37 36 #include "GNodeArray.hpp"
38 37 #include "GFilename.hpp"
39 38  
  39 +/* __ Forward declarations _______________________________________________ */
  40 +class GRan;
  41 +class GTime;
  42 +class GXmlElement;
  43 +
40 44  
41 45 /***********************************************************************//**
42 46 * @class GModelSpectralFunc
... ... @@ -73,9 +77,9 @@ public:
73 77 virtual std::string classname(void) const;
74 78 virtual std::string type(void) const;
75 79 virtual double eval(const GEnergy& srcEng,
76   - const GTime& srcTime) const;
  80 + const GTime& srcTime = GTime()) const;
77 81 virtual double eval_gradients(const GEnergy& srcEng,
78   - const GTime& srcTime);
  82 + const GTime& srcTime = GTime());
79 83 virtual double flux(const GEnergy& emin,
80 84 const GEnergy& emax) const;
81 85 virtual double eflux(const GEnergy& emin,
... ...
include/GModelSpectralGauss.hpp
  View file @4803584
1 1 /***************************************************************************
2 2 * GModelSpectralGauss.hpp - Spectral Gaussian model class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2014-2015 by Christoph Deil & Ellis Owen *
  4 + * copyright (C) 2014-2016 by Christoph Deil & Ellis Owen *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -29,11 +29,15 @@
29 29  
30 30 /* __ Includes ___________________________________________________________ */
31 31 #include <string>
32   -#include "GModelPar.hpp"
33 32 #include "GModelSpectral.hpp"
34   -#include "GEnergy.hpp"
35   -#include "GXmlElement.hpp"
36 33 #include "GFunction.hpp"
  34 +#include "GModelPar.hpp"
  35 +#include "GEnergy.hpp"
  36 +
  37 +/* __ Forward declarations _______________________________________________ */
  38 +class GRan;
  39 +class GTime;
  40 +class GXmlElement;
37 41  
38 42  
39 43 /***********************************************************************//**
... ... @@ -75,9 +79,9 @@ public:
75 79 virtual std::string classname(void) const;
76 80 virtual std::string type(void) const;
77 81 virtual double eval(const GEnergy& srcEng,
78   - const GTime& srcTime) const;
  82 + const GTime& srcTime = GTime()) const;
79 83 virtual double eval_gradients(const GEnergy& srcEng,
80   - const GTime& srcTime);
  84 + const GTime& srcTime = GTime());
81 85 virtual double flux(const GEnergy& emin,
82 86 const GEnergy& emax) const;
83 87 virtual double eflux(const GEnergy& emin,
... ...
include/GModelSpectralLogParabola.hpp
  View file @4803584
1 1 /***************************************************************************
2 2 * GModelSpectralLogParabola.hpp - Log parabola spectral model class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2012-2015 by Michael Mayer *
  4 + * copyright (C) 2012-2016 by Michael Mayer *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -31,12 +31,15 @@
31 31 /* __ Includes ___________________________________________________________ */
32 32 #include <string>
33 33 #include <cmath>
34   -#include "GModelPar.hpp"
35 34 #include "GModelSpectral.hpp"
36   -#include "GEnergy.hpp"
37   -#include "GXmlElement.hpp"
38   -#include "GIntegral.hpp"
39 35 #include "GFunction.hpp"
  36 +#include "GModelPar.hpp"
  37 +#include "GEnergy.hpp"
  38 +
  39 +/* __ Forward declarations _______________________________________________ */
  40 +class GRan;
  41 +class GTime;
  42 +class GXmlElement;
40 43  
41 44  
42 45 /***********************************************************************//**
... ... @@ -80,9 +83,9 @@ public:
80 83 virtual std::string classname(void) const;
81 84 virtual std::string type(void) const;
82 85 virtual double eval(const GEnergy& srcEng,
83   - const GTime& srcTime) const;
  86 + const GTime& srcTime = GTime()) const;
84 87 virtual double eval_gradients(const GEnergy& srcEng,
85   - const GTime& srcTime);
  88 + const GTime& srcTime = GTime());
86 89 virtual double flux(const GEnergy& emin,
87 90 const GEnergy& emax) const;
88 91 virtual double eflux(const GEnergy& emin,
... ...
include/GModelSpectralNodes.hpp
  View file @4803584
1 1 /***************************************************************************
2 2 * GModelSpectralNodes.hpp - Spectral nodes model class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2012-2015 by Juergen Knoedlseder *
  4 + * copyright (C) 2012-2016 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -30,11 +30,16 @@
30 30 /* __ Includes ___________________________________________________________ */
31 31 #include <vector>
32 32 #include <string>
33   -#include "GModelPar.hpp"
34 33 #include "GModelSpectral.hpp"
35   -#include "GEnergy.hpp"
36   -#include "GXmlElement.hpp"
  34 +#include "GModelPar.hpp"
37 35 #include "GNodeArray.hpp"
  36 +#include "GEnergy.hpp"
  37 +//#include "GXmlElement.hpp"
  38 +
  39 +/* __ Forward declarations _______________________________________________ */
  40 +class GRan;
  41 +class GTime;
  42 +class GXmlElement;
38 43  
39 44  
40 45 /***********************************************************************//**
... ... @@ -94,9 +99,9 @@ public:
94 99 virtual std::string classname(void) const;
95 100 virtual std::string type(void) const;
96 101 virtual double eval(const GEnergy& srcEng,
97   - const GTime& srcTime) const;
  102 + const GTime& srcTime = GTime()) const;
98 103 virtual double eval_gradients(const GEnergy& srcEng,
99   - const GTime& srcTime);
  104 + const GTime& srcTime = GTime());
100 105 virtual double flux(const GEnergy& emin,
101 106 const GEnergy& emax) const;
102 107 virtual double eflux(const GEnergy& emin,
... ...
include/GModelSpectralPlaw.hpp
  View file @4803584
1 1 /***************************************************************************
2 2 * GModelSpectralPlaw.hpp - Spectral power law model class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2009-2014 by Juergen Knoedlseder *
  4 + * copyright (C) 2009-2016 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -29,10 +29,15 @@
29 29  
30 30 /* __ Includes ___________________________________________________________ */
31 31 #include <string>
32   -#include "GModelPar.hpp"
33 32 #include "GModelSpectral.hpp"
  33 +#include "GModelPar.hpp"
34 34 #include "GEnergy.hpp"
35   -#include "GXmlElement.hpp"
  35 +//#include "GXmlElement.hpp"
  36 +
  37 +/* __ Forward declarations _______________________________________________ */
  38 +class GRan;
  39 +class GTime;
  40 +class GXmlElement;
36 41  
37 42  
38 43 /***********************************************************************//**
... ... @@ -73,9 +78,9 @@ public:
73 78 virtual std::string classname(void) const;
74 79 virtual std::string type(void) const;
75 80 virtual double eval(const GEnergy& srcEng,
76   - const GTime& srcTime) const;
  81 + const GTime& srcTime = GTime()) const;
77 82 virtual double eval_gradients(const GEnergy& srcEng,
78   - const GTime& srcTime);
  83 + const GTime& srcTime = GTime());
79 84 virtual double flux(const GEnergy& emin,
80 85 const GEnergy& emax) const;
81 86 virtual double eflux(const GEnergy& emin,
... ...
include/GModelSpectralPlaw2.hpp
  View file @4803584
1 1 /***************************************************************************
2 2 * GModelSpectralPlaw2.hpp - Spectral power law model class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2011-2014 by Juergen Knoedlseder *
  4 + * copyright (C) 2011-2016 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -29,10 +29,15 @@
29 29  
30 30 /* __ Includes ___________________________________________________________ */
31 31 #include <string>
32   -#include "GModelPar.hpp"
33 32 #include "GModelSpectral.hpp"
  33 +#include "GModelPar.hpp"
34 34 #include "GEnergy.hpp"
35   -#include "GXmlElement.hpp"
  35 +//#include "GXmlElement.hpp"
  36 +
  37 +/* __ Forward declarations _______________________________________________ */
  38 +class GRan;
  39 +class GTime;
  40 +class GXmlElement;
36 41  
37 42  
38 43 /***********************************************************************//**
... ... @@ -88,9 +93,9 @@ public:
88 93 virtual std::string classname(void) const;
89 94 virtual std::string type(void) const;
90 95 virtual double eval(const GEnergy& srcEng,
91   - const GTime& srcTime) const;
  96 + const GTime& srcTime = GTime()) const;
92 97 virtual double eval_gradients(const GEnergy& srcEng,
93   - const GTime& srcTime);
  98 + const GTime& srcTime = GTime());
94 99 virtual double flux(const GEnergy& emin,
95 100 const GEnergy& emax) const;
96 101 virtual double eflux(const GEnergy& emin,
... ...
include/GModelSpectralSuperExpPlaw.hpp
  View file @4803584
1 1 /***************************************************************************
2 2 * GModelSpectralSuperExpPlaw.hpp - Super exp. cut off power law model *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2014-2015 by Michael Mayer *
  4 + * copyright (C) 2014-2016 by Michael Mayer *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -29,11 +29,16 @@
29 29  
30 30 /* __ Includes ___________________________________________________________ */
31 31 #include <string>
32   -#include "GModelPar.hpp"
33 32 #include "GModelSpectral.hpp"
34   -#include "GEnergy.hpp"
35   -#include "GXmlElement.hpp"
36 33 #include "GFunction.hpp"
  34 +#include "GEnergy.hpp"
  35 +#include "GModelPar.hpp"
  36 +//#include "GXmlElement.hpp"
  37 +
  38 +/* __ Forward declarations _______________________________________________ */
  39 +class GRan;
  40 +class GTime;
  41 +class GXmlElement;
37 42  
38 43  
39 44 /***********************************************************************//**
... ... @@ -81,9 +86,9 @@ public:
81 86 virtual std::string classname(void) const;
82 87 virtual std::string type(void) const;
83 88 virtual double eval(const GEnergy& srcEng,
84   - const GTime& srcTime) const;
  89 + const GTime& srcTime = GTime()) const;
85 90 virtual double eval_gradients(const GEnergy& srcEng,
86   - const GTime& srcTime);
  91 + const GTime& srcTime = GTime());
87 92 virtual double flux(const GEnergy& emin,
88 93 const GEnergy& emax) const;
89 94 virtual double eflux(const GEnergy& emin,
... ...
inst/cta/src/GCTABackground3D.cpp
  View file @4803584
... ... @@ -32,6 +32,7 @@
32 32 #include "GException.hpp"
33 33 #include "GFilename.hpp"
34 34 #include "GMath.hpp"
  35 +#include "GRan.hpp"
35 36 #include "GFits.hpp"
36 37 #include "GFitsBinTable.hpp"
37 38 #include "GCTABackground3D.hpp"
... ...
inst/cta/src/GCTABackgroundPerfTable.cpp
  View file @4803584
... ... @@ -32,6 +32,7 @@
32 32 #include "GTools.hpp"
33 33 #include "GMath.hpp"
34 34 #include "GIntegral.hpp"
  35 +#include "GRan.hpp"
35 36 #include "GCTABackgroundPerfTable.hpp"
36 37  
37 38 /* __ Method name definitions ____________________________________________ */
... ...
pyext/GModelSpectral.i
  View file @4803584
1 1 /***************************************************************************
2 2 * GModelSpectral.i - Abstract spectral model base class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2009-2015 by Juergen Knoedlseder *
  4 + * copyright (C) 2009-2016 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -48,9 +48,9 @@ public:
48 48 virtual std::string classname(void) const = 0;
49 49 virtual std::string type(void) const = 0;
50 50 virtual double eval(const GEnergy& srcEng,
51   - const GTime& srcTime) const = 0;
  51 + const GTime& srcTime = GTime()) const = 0;
52 52 virtual double eval_gradients(const GEnergy& srcEng,
53   - const GTime& srcTime) = 0;
  53 + const GTime& srcTime = GTime()) = 0;
54 54 virtual double flux(const GEnergy& emin,
55 55 const GEnergy& emax) const = 0;
56 56 virtual double eflux(const GEnergy& emin,
... ...
pyext/GModelSpectralBrokenPlaw.i
  View file @4803584
1 1 /***************************************************************************
2 2 * GModelSpectralBrokenPlaw.i - Broken power law spectrum class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2013-2015 by Anneli Schulz *
  4 + * copyright (C) 2013-2016 by Anneli Schulz *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -52,9 +52,9 @@ public:
52 52 virtual std::string classname(void) const;
53 53 virtual std::string type(void) const;
54 54 virtual double eval(const GEnergy& srcEng,
55   - const GTime& srcTime) const;
  55 + const GTime& srcTime = GTime()) const;
56 56 virtual double eval_gradients(const GEnergy& srcEng,
57   - const GTime& srcTime);
  57 + const GTime& srcTime = GTime());
58 58 virtual double flux(const GEnergy& emin,
59 59 const GEnergy& emax) const;
60 60 virtual double eflux(const GEnergy& emin,
... ...
pyext/GModelSpectralConst.i
  View file @4803584
1 1 /***************************************************************************
2 2 * GModelSpectralConst.i - Spectral constant model class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2011-2015 by Juergen Knoedlseder *
  4 + * copyright (C) 2011-2016 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -49,9 +49,9 @@ public:
49 49 virtual std::string classname(void) const;
50 50 virtual std::string type(void) const;
51 51 virtual double eval(const GEnergy& srcEng,
52   - const GTime& srcTime) const;
  52 + const GTime& srcTime = GTime()) const;
53 53 virtual double eval_gradients(const GEnergy& srcEng,
54   - const GTime& srcTime);
  54 + const GTime& srcTime = GTime());
55 55 virtual double flux(const GEnergy& emin,
56 56 const GEnergy& emax) const;
57 57 virtual double eflux(const GEnergy& emin,
... ...
pyext/GModelSpectralExpPlaw.i
  View file @4803584
1 1 /***************************************************************************
2 2 * GModelSpectralExpPlaw.i - Exponential cut off power law model *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2009-2015 by Juergen Knoedlseder *
  4 + * copyright (C) 2009-2016 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -52,9 +52,9 @@ public:
52 52 virtual std::string classname(void) const;
53 53 virtual std::string type(void) const;
54 54 virtual double eval(const GEnergy& srcEng,
55   - const GTime& srcTime) const;
  55 + const GTime& srcTime = GTime()) const;
56 56 virtual double eval_gradients(const GEnergy& srcEng,
57   - const GTime& srcTime);
  57 + const GTime& srcTime = GTime());
58 58 virtual double flux(const GEnergy& emin,
59 59 const GEnergy& emax) const;
60 60 virtual double eflux(const GEnergy& emin,
... ...
pyext/GModelSpectralFunc.i
  View file @4803584
... ... @@ -50,9 +50,9 @@ public:
50 50 virtual std::string classname(void) const;
51 51 virtual std::string type(void) const;
52 52 virtual double eval(const GEnergy& srcEng,
53   - const GTime& srcTime) const;
  53 + const GTime& srcTime = GTime()) const;
54 54 virtual double eval_gradients(const GEnergy& srcEng,
55   - const GTime& srcTime);
  55 + const GTime& srcTime = GTime());
56 56 virtual double flux(const GEnergy& emin,
57 57 const GEnergy& emax) const;
58 58 virtual double eflux(const GEnergy& emin,
... ...
pyext/GModelSpectralGauss.i
  View file @4803584
... ... @@ -51,9 +51,9 @@ public:
51 51 virtual std::string classname(void) const;
52 52 virtual std::string type(void) const;
53 53 virtual double eval(const GEnergy& srcEng,
54   - const GTime& srcTime) const;
  54 + const GTime& srcTime = GTime()) const;
55 55 virtual double eval_gradients(const GEnergy& srcEng,
56   - const GTime& srcTime);
  56 + const GTime& srcTime = GTime());
57 57 virtual double flux(const GEnergy& emin,
58 58 const GEnergy& emax) const;
59 59 virtual double eflux(const GEnergy& emin,
... ...
pyext/GModelSpectralLogParabola.i
  View file @4803584
... ... @@ -52,9 +52,9 @@ public:
52 52 virtual std::string classname(void) const;
53 53 virtual std::string type(void) const;
54 54 virtual double eval(const GEnergy& srcEng,
55   - const GTime& srcTime) const;
  55 + const GTime& srcTime = GTime()) const;
56 56 virtual double eval_gradients(const GEnergy& srcEng,
57   - const GTime& srcTime);
  57 + const GTime& srcTime = GTime());
58 58 virtual double flux(const GEnergy& emin,
59 59 const GEnergy& emax) const;
60 60 virtual double eflux(const GEnergy& emin,
... ...
pyext/GModelSpectralNodes.i
  View file @4803584
1 1 /***************************************************************************
2 2 * GModelSpectralNodes.i - Spectral nodes model class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2012-2015 by Juergen Knoedlseder *
  4 + * copyright (C) 2012-2016 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -48,9 +48,9 @@ public:
48 48 virtual std::string classname(void) const;
49 49 virtual std::string type(void) const;
50 50 virtual double eval(const GEnergy& srcEng,
51   - const GTime& srcTime) const;
  51 + const GTime& srcTime = GTime()) const;
52 52 virtual double eval_gradients(const GEnergy& srcEng,
53   - const GTime& srcTime);
  53 + const GTime& srcTime = GTime());
54 54 virtual double flux(const GEnergy& emin,
55 55 const GEnergy& emax) const;
56 56 virtual double eflux(const GEnergy& emin,
... ...
pyext/GModelSpectralPlaw.i
  View file @4803584
1 1 /***************************************************************************
2 2 * GModelSpectralPlaw.i - Spectral power law model class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2009-2015 by Juergen Knoedlseder *
  4 + * copyright (C) 2009-2016 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -51,9 +51,9 @@ public:
51 51 virtual std::string classname(void) const;
52 52 virtual std::string type(void) const;
53 53 virtual double eval(const GEnergy& srcEng,
54   - const GTime& srcTime) const;
  54 + const GTime& srcTime = GTime()) const;
55 55 virtual double eval_gradients(const GEnergy& srcEng,
56   - const GTime& srcTime);
  56 + const GTime& srcTime = GTime());
57 57 virtual double flux(const GEnergy& emin,
58 58 const GEnergy& emax) const;
59 59 virtual double eflux(const GEnergy& emin,
... ...
pyext/GModelSpectralPlaw2.i
  View file @4803584
1 1 /***************************************************************************
2 2 * GModelSpectralPlaw2.i - Spectral power law model class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2011-2015 by Juergen Knoedlseder *
  4 + * copyright (C) 2011-2016 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -52,9 +52,9 @@ public:
52 52 virtual std::string classname(void) const;
53 53 virtual std::string type(void) const;
54 54 virtual double eval(const GEnergy& srcEng,
55   - const GTime& srcTime) const;
  55 + const GTime& srcTime = GTime()) const;
56 56 virtual double eval_gradients(const GEnergy& srcEng,
57   - const GTime& srcTime);
  57 + const GTime& srcTime = GTime());
58 58 virtual double flux(const GEnergy& emin,
59 59 const GEnergy& emax) const;
60 60 virtual double eflux(const GEnergy& emin,
... ...
pyext/GModelSpectralSuperExpPlaw.i
  View file @4803584
1 1 /***************************************************************************
2 2 * GModelSpectralSuperExpPlaw.i - Super exp. cut off power law model *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2014-2015 by Michael Mayer *
  4 + * copyright (C) 2014-2016 by Michael Mayer *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -53,9 +53,9 @@ public:
53 53 virtual std::string classname(void) const;
54 54 virtual std::string type(void) const;
55 55 virtual double eval(const GEnergy& srcEng,
56   - const GTime& srcTime) const;
  56 + const GTime& srcTime = GTime()) const;
57 57 virtual double eval_gradients(const GEnergy& srcEng,
58   - const GTime& srcTime);
  58 + const GTime& srcTime = GTime());
59 59 virtual double flux(const GEnergy& emin,
60 60 const GEnergy& emax) const;
61 61 virtual double eflux(const GEnergy& emin,
... ...
src/model/GModelSpectral.cpp
  View file @4803584
1 1 /***************************************************************************
2 2 * GModelSpectral.cpp - Abstract spectral model base class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2009-2015 by Juergen Knoedlseder *
  4 + * copyright (C) 2009-2016 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -30,6 +30,7 @@
30 30 #endif
31 31 #include "GException.hpp"
32 32 #include "GModelSpectral.hpp"
  33 +#include "GModelPar.hpp"
33 34  
34 35 /* __ Method name definitions ____________________________________________ */
35 36 #define G_ACCESS "GModelSpectral::operator[](std::string&)"
... ...
src/model/GModelSpectralBrokenPlaw.cpp
  View file @4803584
1 1 /***************************************************************************
2 2 * GModelSpectralBrokenPlaw.cpp - Broken power law spectrum class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2013 by Anneli Schulz *
  4 + * copyright (C) 2013-2016 by Anneli Schulz *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -31,6 +31,7 @@
31 31 #include <cmath>
32 32 #include "GException.hpp"
33 33 #include "GTools.hpp"
  34 +#include "GRan.hpp"
34 35 #include "GModelSpectralBrokenPlaw.hpp"
35 36 #include "GModelSpectralRegistry.hpp"
36 37  
... ...
src/model/GModelSpectralConst.cpp
  View file @4803584
1 1 /***************************************************************************
2 2 * GModelSpectralConst.cpp - Spectral constant model class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2009-2013 by Juergen Knoedlseder *
  4 + * copyright (C) 2009-2016 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -30,6 +30,7 @@
30 30 #endif
31 31 #include "GException.hpp"
32 32 #include "GTools.hpp"
  33 +#include "GRan.hpp"
33 34 #include "GModelSpectralConst.hpp"
34 35 #include "GModelSpectralRegistry.hpp"
35 36  
... ...
src/model/GModelSpectralExpPlaw.cpp
  View file @4803584
1 1 /***************************************************************************
2 2 * GModelSpectralExpPlaw.cpp - Exponential cut off power law model *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2010-2014 by Juergen Knoedlseder *
  4 + * copyright (C) 2010-2016 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -31,6 +31,7 @@
31 31 #include <cmath>
32 32 #include "GException.hpp"
33 33 #include "GTools.hpp"
  34 +#include "GRan.hpp"
34 35 #include "GIntegral.hpp"
35 36 #include "GModelSpectralExpPlaw.hpp"
36 37 #include "GModelSpectralRegistry.hpp"
... ...
src/model/GModelSpectralFunc.cpp
  View file @4803584
... ... @@ -32,6 +32,7 @@
32 32 #include "GException.hpp"
33 33 #include "GTools.hpp"
34 34 #include "GCsv.hpp"
  35 +#include "GRan.hpp"
35 36 #include "GModelSpectralFunc.hpp"
36 37 #include "GModelSpectralRegistry.hpp"
37 38  
... ...
src/model/GModelSpectralGauss.cpp
  View file @4803584
1 1 /***************************************************************************
2 2 * GModelSpectralGauss.cpp - Spectral Gaussian model class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2014 by Christoph Deil & Ellis Owen *
  4 + * copyright (C) 2014-2016 by Christoph Deil & Ellis Owen *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -31,10 +31,11 @@
31 31 #include "GException.hpp"
32 32 #include "GTools.hpp"
33 33 #include "GMath.hpp"
34   -#include "GModelSpectralGauss.hpp"
35   -#include "GModelSpectralRegistry.hpp"
  34 +#include "GRan.hpp"
36 35 #include "GFunction.hpp"
37 36 #include "GIntegral.hpp"
  37 +#include "GModelSpectralGauss.hpp"
  38 +#include "GModelSpectralRegistry.hpp"
38 39  
39 40 /* __ Constants __________________________________________________________ */
40 41  
... ...
src/model/GModelSpectralLogParabola.cpp
  View file @4803584
1 1 /***************************************************************************
2 2 * GModelSpectralLogParabola.cpp - Log parabola spectral model class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2012-2014 by Michael Mayer *
  4 + * copyright (C) 2012-2016 by Michael Mayer *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -31,6 +31,7 @@
31 31 #include <cmath>
32 32 #include "GException.hpp"
33 33 #include "GTools.hpp"
  34 +#include "GRan.hpp"
34 35 #include "GIntegral.hpp"
35 36 #include "GModelSpectralLogParabola.hpp"
36 37 #include "GModelSpectralRegistry.hpp"
... ...
src/model/GModelSpectralNodes.cpp
  View file @4803584
1 1 /***************************************************************************
2 2 * GModelSpectralNodes.cpp - Spectral nodes model class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2012-2013 by Juergen Knoedlseder *
  4 + * copyright (C) 2012-2016 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -31,6 +31,7 @@
31 31 #include <cmath>
32 32 #include "GException.hpp"
33 33 #include "GTools.hpp"
  34 +#include "GRan.hpp"
34 35 #include "GModelSpectralNodes.hpp"
35 36 #include "GModelSpectralRegistry.hpp"
36 37  
... ...
src/model/GModelSpectralPlaw.cpp
  View file @4803584
1 1 /***************************************************************************
2 2 * GModelSpectralPlaw.cpp - Spectral power law model class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2009-2014 by Juergen Knoedlseder *
  4 + * copyright (C) 2009-2016 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -31,6 +31,7 @@
31 31 #include <cmath>
32 32 #include "GException.hpp"
33 33 #include "GTools.hpp"
  34 +#include "GRan.hpp"
34 35 #include "GModelSpectralPlaw.hpp"
35 36 #include "GModelSpectralRegistry.hpp"
36 37  
... ...
src/model/GModelSpectralPlaw2.cpp
  View file @4803584
1 1 /***************************************************************************
2 2 * GModelSpectralPlaw2.cpp - Spectral power law model class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2010-2014 by Juergen Knoedlseder *
  4 + * copyright (C) 2010-2016 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -32,6 +32,7 @@
32 32 #include "GException.hpp"
33 33 #include "GTools.hpp"
34 34 #include "GMath.hpp"
  35 +#include "GRan.hpp"
35 36 #include "GModelSpectralPlaw2.hpp"
36 37 #include "GModelSpectralRegistry.hpp"
37 38  
... ...
src/model/GModelSpectralSuperExpPlaw.cpp
  View file @4803584
1 1 /***************************************************************************
2 2 * GModelSpectralSuperExpPlaw.cpp - Super exp. cut off power law model *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2014 by Michael Mayer *
  4 + * copyright (C) 2014-2016 by Michael Mayer *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -31,6 +31,7 @@
31 31 #include <cmath>
32 32 #include "GException.hpp"
33 33 #include "GTools.hpp"
  34 +#include "GRan.hpp"
34 35 #include "GIntegral.hpp"
35 36 #include "GModelSpectralSuperExpPlaw.hpp"
36 37 #include "GModelSpectralRegistry.hpp"
... ...