bug fixes to address order param query

Luigi Tibaldo
1 parent 9644a959
Showing 4 changed files with 69 additions and 9 deletions
cscripts/cslightcrv.par
cscripts/cslightcrv.py
cscripts/obsutils.py
src/support/ctool.cpp
@@ -16,12 +16,13 @@
 #
 # Input and output parameters
 #============================
-inobs,     f, a, events.fits,,, "Input event list or observation definition XML file"
-inmodel,   f, a, $CTOOLS/share/models/crab.xml,,, "Input model definition XML file"
-srcname,   s, a, Crab,,, "Source name"
-caldb,     s, a, prod2,,, "Calibration database"
-irf,       s, a, South_0.5h,,, "Instrument response function"
-edisp,     b, h, no,,, "Apply energy dispersion?"
+inobs,        f, a, events.fits,,, "Input event list or observation definition XML file"
+inmodel,      f, a, $CTOOLS/share/models/crab.xml,,, "Input model definition XML file"
+srcname,      s, a, Crab,,, "Source name"
+caldb,        s, a, prod2,,, "Calibration database"
+irf,          s, a, South_0.5h,,, "Instrument response function"
+inexclusion,  f, h, NONE,,, "Sky map of exclusion regions for On/Off analysis"
+edisp,     b, h, no,,, "Apply energy dispersion in Cube analysis?"
 outfile,   f, a, lightcurve.fits,,, "Output light curve file"
  
 #
@@ -32,9 +33,10 @@ tmin,      t, a, MJD 51544.5,,,&quot;Lightcurve start time (UTC string, JD, MJD or ME
 tmax,      t, a, MJD 51544.6,,,"Lightcurve stop time (UTC string, JD, MJD or MET in seconds)"
 tbins,     i, a, 5,1,10000, "Number of time bins"
 tbinfile,  f, a, NONE,,, "File defining the time binning"
+method,    s, a, CUBE, CUBE|ONOFF,, "Analysis method"
 emin,      r, a, 0.1,,, "Lower energy limit of events (TeV)"
 emax,      r, a, 100.0,,, "Upper energy limit of events (TeV)"
-enumbins,  i, a, 0,0,100, "Number of energy bins for binned (0=unbinned)"
+enumbins,  i, a, 0,0,100, "Number of energy bins for binned (0=unbinned for Cube analysis only)"
 coordsys,  s, a, CEL,CEL|GAL,, "Coordinate System"
 proj,      s, a, CAR,AIT|AZP|CAR|GLS|MER|MOL|SFL|SIN|STG|TAN,, "Projection method"
 xref,      r, a, 83.63,0,360, "First coordinate of image center in degrees (RA or galactic l)"
@@ -42,6 +44,14 @@ yref,      r, a, 22.01,-90,90, &quot;Second coordinate of image center in degrees (DE
 nxpix,     i, a, 200,,, "Size of the X axis in pixels"
 nypix,     i, a, 200,,, "Size of the Y axis in pixels"
 binsz,     r, a, 0.02,,, "Pixel size (deg/pixel)"
+srcshape,  s, h, CIRCLE,CIRCLE,, "Shape of the source region"
+rad,       r, a, 0.2,0,180, "Radius of source region circle (deg)"
+bkgmethod, s, h, REFLECTED,REFLECTED,, "Method for background estimation"
+bkgregmin, i, h, 2,1,1000, "Minimum number of background regions"
+maxoffset, r, h, 4.0,,, "Maximum offset of source from camera center to accept observation"
+etruemin,  r, h, 0.01,,, "Minimum true energy (TeV)"
+etruemax,  r, h, 300.0,,, "Maximum true energy (TeV)"
+etruebins, i, h, 30,,, "Number of bins per decade for true energy bins"
 statistic, s, h, DEFAULT,DEFAULT|CSTAT|WSTAT|CHI2,, "Optimization statistic"
 calc_ts,   b, h, yes,,, "Compute TS value for each bin?"
 calc_ulim, b, h, yes,,, "Compute upper limit for each bin?"
@@ -75,6 +75,7 @@ class cslightcrv(ctools.csobservation):
         self._srcname = ''
         self._tbins   = gammalib.GGti()
         self._stacked = False
+        self._onoff = False
         self._fits    = gammalib.GFits()
  
         # Return
@@ -103,8 +104,14 @@ class cslightcrv(ctools.csobservation):
         # Get time boundaries
         self._tbins = self._create_tbounds()
  
+        # Set On/Off analysis flag and query relevant user parameters
+        self._onoff = self._is_onoff()
+
+        # If cube analysis is selected
         # Set stacked analysis flag and query relevant user parameters
-        self._stacked = self._is_stacked()
+        if not self._onoff:
+            self._stacked = self._is_stacked()
+
  
         # Query the hidden parameters, just in case
         self['edisp'].boolean()
@@ -390,6 +397,39 @@ class cslightcrv(ctools.csobservation):
         # Return new oberservation container
         return new_obs
  
+    def _gen_onoff(self, obs):
+        """
+        Create On/Off observations if On/Off analysis was requested
+
+        Parameters
+        ----------
+        obs : `~gammalib.GObservations`
+            Observation container
+
+        Returns
+        -------
+        obs : `~gammalib.GObservations`
+            Observation container with On/Off observations
+        """
+        # Get new observation container with binned observation
+        new_obs = obsutils.get_onoff_obs(self, obs)
+
+        # Extract models
+        models = new_obs.models()
+
+        # Fix background models if required
+        if self['fix_bkg'].boolean():
+            for model in models:
+                if model.classname() != 'GModelSky':
+                    for par in model:
+                        par.fix()
+
+        # Put back models
+        new_obs.models(models)
+
+        # Return new oberservation container
+        return new_obs
+
  
     # Public methods
     def run(self):
@@ -488,6 +528,10 @@ class cslightcrv(ctools.csobservation):
             # an observation container with a single stacked observation.
             if self._stacked:
                 obs = self._bin_observation(obs)
+            # Otherwise if On/Off analysis is requested generate
+            # the On/Off observations and response
+            if self._onoff:
+                obs = self._gen_onoff(obs)
  
             # Header
             self._log_header3(gammalib.EXPLICIT, 'Fitting the data')
@@ -812,4 +812,4 @@ def get_onoff_obs(cls, obs):
  
     onoff_obs = phagen.obs().copy()
  
-    return onoff_obs
 \ No newline at end of file
+    return onoff_obs
@@ -1216,6 +1216,12 @@ bool ctool::is_onoff(void)
        onoff = true;
        //query csphagen parameters
        (*this)["inexclusion"].filename();
+       (*this)["emin"].real();
+       (*this)["emax"].real();
+       (*this)["enumbins"].integer();
+       (*this)["coordsys"].string();
+       (*this)["xref"].real();
+       (*this)["yref"].real();
        if ((*this)["srcshape"].string() == "CIRCLE"){
 	 (*this)["rad"].real();
        }