From 2a41df9074cd3eafc8d5650a1d58410c0e88670a Mon Sep 17 00:00:00 2001 From: Jürgen Knödlseder Date: Fri, 29 Mar 2019 15:12:30 +0100 Subject: [PATCH] Reorder code to reduce code duplication ;) --- cscripts/cslightcrv.py | 8 ++++---- cscripts/csphasecrv.py | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cscripts/cslightcrv.py b/cscripts/cslightcrv.py index e8d3732..3a16987 100755 --- a/cscripts/cslightcrv.py +++ b/cscripts/cslightcrv.py @@ -120,8 +120,8 @@ class cslightcrv(ctools.csobservation): ctools.csobservation.__setstate__(self, state['base']) self._srcname = state['srcname'] self._tbins = state['tbins'] - self._onoff = state['onoff'] self._stacked = state['stacked'] + self._onoff = state['onoff'] self._fits = state['fits'] self._nthreads = state['nthreads'] self._excl_reg_map = state['excl_reg_map'] @@ -145,15 +145,15 @@ class cslightcrv(ctools.csobservation): if self.obs().models().size() == 0: self.obs().models(self['inmodel'].filename()) - # Get source name - self._srcname = self['srcname'].string() - # Get time boundaries self._tbins = self._create_tbounds() # Set On/Off analysis flag and query relevant user parameters self._onoff = self._is_onoff() + # Get source name + self._srcname = self['srcname'].string() + # Set stacked analysis flag and query relevant user parameters if not self._onoff: self._stacked = self._is_stacked() diff --git a/cscripts/csphasecrv.py b/cscripts/csphasecrv.py index 2644820..587cd31 100755 --- a/cscripts/csphasecrv.py +++ b/cscripts/csphasecrv.py @@ -91,9 +91,9 @@ class csphasecrv(ctools.csobservation): 'stacked' : self._stacked, 'onoff' : self._onoff, 'fits' : self._fits, - 'fitmodels' : self._fitmodels, 'nthreads' : self._nthreads, - 'excl_reg_map' : self._excl_reg_map} + 'excl_reg_map' : self._excl_reg_map, + 'fitmodels' : self._fitmodels} # Return pickled dictionary return state @@ -110,12 +110,12 @@ class csphasecrv(ctools.csobservation): ctools.csobservation.__setstate__(self, state['base']) self._srcname = state['srcname'] self._phbins = state['phbins'] - self._onoff = state['onoff'] self._stacked = state['stacked'] + self._onoff = state['onoff'] self._fits = state['fits'] - self._fitmodels = state['fitmodels'] self._nthreads = state['nthreads'] self._excl_reg_map = state['excl_reg_map'] + self._fitmodels = state['fitmodels'] # Return return @@ -136,15 +136,15 @@ class csphasecrv(ctools.csobservation): if self.obs().models().size() == 0: self.obs().models(self['inmodel'].filename()) - # Get source name - self._srcname = self['srcname'].string() - # Get phase boundaries self._phbins = self._create_tbounds() # Set On/Off analysis flag and query relevant user parameters self._onoff = self._is_onoff() + # Get source name + self._srcname = self['srcname'].string() + # If cube analysis is selected # Set stacked analysis flag and query relevant user parameters if not self._onoff: -- libgit2 0.21.4