Commit 48505ab0d4b6f4c053f7921a0c762b6fd63a9237

Authored by Jürgen Knödlseder
1 parent 35ba5976

Integrate code.

src/ctbutterfly/ctbutterfly.hpp
@@ -80,10 +80,10 @@ protected: @@ -80,10 +80,10 @@ protected:
80 void get_parameters(void); 80 void get_parameters(void);
81 81
82 // User parameters 82 // User parameters
83 - std::string m_srcname; //!< Name of source to compute butterfly  
84 - std::string m_outfile; //!< Output ascii file  
85 - GEbounds m_ebounds; //!< Energy binning definition  
86 - bool m_apply_edisp; //!< Apply energy dispersion? 83 + std::string m_srcname; //!< Name of source to compute butterfly
  84 + std::string m_outfile; //!< Output ascii file
  85 + GEbounds m_ebounds; //!< Energy binning definition
  86 + bool m_apply_edisp; //!< Apply energy dispersion?
87 87
88 // Protected members 88 // Protected members
89 GObservations m_obs; //!< Observation container 89 GObservations m_obs; //!< Observation container
src/ctbutterfly/ctbutterfly.par
@@ -25,9 +25,9 @@ psfcube, f, a, &quot;NONE&quot;,,, &quot;PSF cube file (only needed for stacked analysis)&quot; @@ -25,9 +25,9 @@ psfcube, f, a, &quot;NONE&quot;,,, &quot;PSF cube file (only needed for stacked analysis)&quot;
25 bkgcube, f, a, "NONE",,, "Background cube file (only needed for stacked analysis)" 25 bkgcube, f, a, "NONE",,, "Background cube file (only needed for stacked analysis)"
26 caldb, s, a, "prod2",,, "Calibration database" 26 caldb, s, a, "prod2",,, "Calibration database"
27 irf, s, a, "South_50h",,, "Instrument response function" 27 irf, s, a, "South_50h",,, "Instrument response function"
  28 +edisp, b, h, no,,, "Apply energy dispersion?"
28 outfile, f, a, "butterfly.txt",,, "Output ascii file" 29 outfile, f, a, "butterfly.txt",,, "Output ascii file"
29 matrix, f, h, "NONE",,, "Input covariance Matrix FITS file" 30 matrix, f, h, "NONE",,, "Input covariance Matrix FITS file"
30 -edisp, b, h, no,,, "Apply energy dispersion?"  
31 31
32 # 32 #
33 # Energy binning parameters 33 # Energy binning parameters
src/cterror/cterror.hpp
@@ -78,7 +78,7 @@ protected: @@ -78,7 +78,7 @@ protected:
78 double m_tol; //!< Tolerance for limit determination 78 double m_tol; //!< Tolerance for limit determination
79 int m_max_iter; //!< Maximum number of iterations 79 int m_max_iter; //!< Maximum number of iterations
80 double m_value; //!< Parameter value 80 double m_value; //!< Parameter value
81 - bool m_apply_edisp; //!< Apply energy dispersion? 81 + bool m_apply_edisp; //!< Apply energy dispersion?
82 82
83 // Protected members 83 // Protected members
84 GObservations m_obs; //!< Observation container 84 GObservations m_obs; //!< Observation container
src/cttsmap/cttsmap.hpp
@@ -84,22 +84,22 @@ protected: @@ -84,22 +84,22 @@ protected:
84 void init_maps(const GSkyMap& map); 84 void init_maps(const GSkyMap& map);
85 85
86 // User parameters 86 // User parameters
87 - std::string m_srcname; //!< Name of source which is moved around  
88 - std::string m_outmap; //!< Output counts map or XML file  
89 - bool m_apply_edisp; //!< Apply energy dispersion? 87 + std::string m_srcname; //!< Name of source which is moved around
  88 + std::string m_outmap; //!< Output counts map or XML file
  89 + bool m_apply_edisp; //!< Apply energy dispersion?
90 90
91 // Parameters to control speed and job splitting 91 // Parameters to control speed and job splitting
92 - int m_binmin; //!< Map bin number from which computation should start  
93 - int m_binmax; //!< Map bin number where map computation should end  
94 - double m_logL0; //!< Likelihood value of null hypothesis 92 + int m_binmin; //!< Map bin number from which computation should start
  93 + int m_binmax; //!< Map bin number where map computation should end
  94 + double m_logL0; //!< Likelihood value of null hypothesis
95 95
96 // Protected members 96 // Protected members
97 - GObservations m_obs; //!< Observation container  
98 - GSkyMap m_tsmap; //!< TS map  
99 - GSkyMap m_statusmap; //!< Map of computed bins  
100 - std::vector<std::string> m_mapnames; //!< Names of free parameters  
101 - std::vector<GSkyMap> m_maps; //!< Sky maps for each free parameter  
102 - GModel* m_testsource; //!< Pointer to test source for TS computation 97 + GObservations m_obs; //!< Observation container
  98 + GSkyMap m_tsmap; //!< TS map
  99 + GSkyMap m_statusmap; //!< Map of computed bins
  100 + std::vector<std::string> m_mapnames; //!< Names of free parameters
  101 + std::vector<GSkyMap> m_maps; //!< Sky maps for each free parameter
  102 + GModel* m_testsource; //!< Pointer to test source for TS computation
103 }; 103 };
104 104
105 105
src/cttsmap/cttsmap.par
@@ -25,8 +25,8 @@ psfcube, f, a, &quot;NONE&quot;,,, &quot;PSF cube file (only needed for stacked analysis)&quot; @@ -25,8 +25,8 @@ psfcube, f, a, &quot;NONE&quot;,,, &quot;PSF cube file (only needed for stacked analysis)&quot;
25 bkgcube, f, a, "NONE",,, "Background cube file (only needed for stacked analysis)" 25 bkgcube, f, a, "NONE",,, "Background cube file (only needed for stacked analysis)"
26 caldb, s, a, "prod2",,, "Calibration database" 26 caldb, s, a, "prod2",,, "Calibration database"
27 irf, s, a, "South_50h",,, "Instrument response function" 27 irf, s, a, "South_50h",,, "Instrument response function"
28 -outmap, f, a, "tsmap.fits",,, "Output Test Statistic map"  
29 edisp, b, h, no,,, "Apply energy dispersion?" 28 edisp, b, h, no,,, "Apply energy dispersion?"
  29 +outmap, f, a, "tsmap.fits",,, "Output Test Statistic map"
30 30
31 # 31 #
32 # Spatial binning parameters 32 # Spatial binning parameters
src/ctulimit/ctulimit.hpp
@@ -93,7 +93,7 @@ protected: @@ -93,7 +93,7 @@ protected:
93 double m_emax; //!< Maximum energy for flux limits (TeV) 93 double m_emax; //!< Maximum energy for flux limits (TeV)
94 double m_tol; //!< Tolerance for limit determination 94 double m_tol; //!< Tolerance for limit determination
95 int m_max_iter; //!< Maximum number of iterations 95 int m_max_iter; //!< Maximum number of iterations
96 - bool m_apply_edisp; //!< Apply energy dispersion? 96 + bool m_apply_edisp; //!< Apply energy dispersion?
97 97
98 // Protected members 98 // Protected members
99 GObservations m_obs; //!< Observation container 99 GObservations m_obs; //!< Observation container