Integrate code.

Jürgen Knödlseder
1 parent 43b52cb3
Showing 4 changed files with 17 additions and 45 deletions
cscripts/csspec.py
doc/source/reference_manual/csspec.rst
src/ctcubemask/ctcubemask.cpp
src/ctcubemask/ctcubemask.hpp
@@ -157,8 +157,8 @@ class csspec(ctools.cscript):
  
             # Read user parameters
             self.m_enumbins = self["enumbins"].integer()
-            self.m_emin = self["emin"].real() - 1e-6 #rounding tolerance
-            self.m_emax = self["emax"].real() + 1e-6 #rounding tolerance
+            self.m_emin     = self["emin"].real() - 1e-6 #rounding tolerance
+            self.m_emax     = self["emax"].real() + 1e-6 #rounding tolerance
  
             # Compute number of energy layers used for one spectral bin
             n_layers = cube_ebounds.size() / self.m_enumbins 
@@ -316,19 +316,19 @@ class csspec(ctools.cscript):
  
         # Create FITS table columns
         energy       = gammalib.GFitsTableDoubleCol("Energy", self.m_ebounds.size())
-        energy.unit("TeV")
         energy_low   = gammalib.GFitsTableDoubleCol("ed_Energy", self.m_ebounds.size())
-        energy_low.unit("TeV")
         energy_high  = gammalib.GFitsTableDoubleCol("eu_Energy", self.m_ebounds.size())
-        energy_high.unit("TeV")
         flux         = gammalib.GFitsTableDoubleCol("Flux", self.m_ebounds.size())
-        flux.unit("erg/cm2/s")
         flux_err     = gammalib.GFitsTableDoubleCol("e_Flux", self.m_ebounds.size())
-        flux_err.unit("erg/cm2/s")
         TSvalues     = gammalib.GFitsTableDoubleCol("TS", self.m_ebounds.size())
         ulim_values  = gammalib.GFitsTableDoubleCol("UpperLimit", self.m_ebounds.size())
-        ulim_values.unit("erg/cm2/s")
         Npred_values = gammalib.GFitsTableDoubleCol("Npred", self.m_ebounds.size())
+        energy.unit("TeV")
+        energy_low.unit("TeV")
+        energy_high.unit("TeV")
+        flux.unit("erg/cm2/s")
+        flux_err.unit("erg/cm2/s")
+        ulim_values.unit("erg/cm2/s")
  
  
         # Loop over energy bins
@@ -380,6 +380,7 @@ class csspec(ctools.cscript):
                 if self.logTerse():
                     self.log.header3("Selecting events")
  
+                # Select layers
                 cubemask            = ctools.ctcubemask(self.obs)
                 cubemask["regfile"] = "NONE"
                 cubemask["ra"]      = "UNDEFINED"
@@ -19,8 +19,6 @@ of the source detection. Optionally, it also computes an upper flux limit
 that is particularily useful in case that the source is not significantly
 detected within an energy bin (hidden parameter ``calc_ulim``).
  
-The script works on event lists only.
-
 On output, the script will provide a FITS file with the fitted source 
 spectrum.
  
@@ -56,6 +54,9 @@ General parameters
 ``irf [string]``
     Instrumental response function.
  
+``(edisp = no) [boolean]``
+    Apply energy dispersion to response computation?
+
 ``emin [real]``
     Lower energy limit of events (in TeV).
  
@@ -68,36 +69,6 @@ General parameters
 ``(ebinalg = LOG) <FILE|LIN|LOG> [string]``
     Algorithm for defining energy bins.
  
-``binned [boolean]``
-    Specifies whether a binned computation should be used.
-
-``(nebins = 5) [integer]``
-    Number of bins per spectral point for binned analysis.
-
-``coordsys <CEL|GAL> [string]``
-    Coordinate system (CEL - celestial, GAL - galactic).
- 	 	 
-``proj <AIT|AZP|CAR|MER|MOL|STG|TAN> [string]``
-    Projection method.
-
-``xref [real]``
-    Right Ascension / Galactic longitude of image centre (J2000, in degrees).
- 	 	 
-``yref [real]``
-    Declination / Galactic latitude of image centre (J2000, in degrees).
-
-``nxpix [integer]``
-    Size of the Right Ascension / Galactic longitude axis (in pixels).
- 	 	 
-``nypix [integer]``
-    Size of the Declination / Galactic latitude axis (in pixels).
- 	 	 
-``binsz [real]``
-    Pixel size (in degrees/pixel).
-
-``(anumbins = 200) [integer]``
-    Number of angular separation bins.
- 	 	 
 ``(calc_ts = yes) [boolean]``
     Compute TS for each spectral point?
  
@@ -363,7 +363,7 @@ void ctcubemask::get_parameters(void)
             std::string msg = "A valid file needs to be specified for the "
                               "\"inobs\" parameter, yet \""+
                               (*this)["inobs"].filename()+"\" was given."
-                              " Specify a vaild observation definition or "
+                              " Specify a valid observation definition or "
                               "event list FITS file to proceed.";
             throw GException::invalid_value(G_GET_PARAMETERS, msg);
         }
@@ -600,8 +600,8 @@ void ctcubemask::copy_members(const ctcubemask&amp; app)
     m_emax    = app.m_emax;
  
     // Copy protected members
-    m_obs        = app.m_obs;
-    m_infiles    = app.m_infiles;
+    m_obs           = app.m_obs;
+    m_infiles       = app.m_infiles;
     m_select_energy = app.m_select_energy;
     m_select_roi    = app.m_select_roi;
  
@@ -90,8 +90,8 @@ protected:
     double      m_emax;       //!< Upper energy
  
     // Protected members
-    GObservations            m_obs;        //!< Observations container
-    std::vector<std::string> m_infiles;    //!< Input event filenames
+    GObservations            m_obs;           //!< Observations container
+    std::vector<std::string> m_infiles;       //!< Input event filenames
     bool                     m_select_energy; //!< Perform energy selection
     bool                     m_select_roi;    //!< Perform ROI selection
 };