From c4d37dea85ce761e08df1b0f3f70754b2dfee13d Mon Sep 17 00:00:00 2001 From: Jürgen Knödlseder Date: Fri, 12 Aug 2016 17:56:09 +0200 Subject: [PATCH] Reduce number of lines for code duplication (#1828) --- cscripts/cspull.py | 25 ++++++++----------------- cscripts/cstsdist.py | 23 ++++++++--------------- 2 files changed, 16 insertions(+), 32 deletions(-) diff --git a/cscripts/cspull.py b/cscripts/cspull.py index 3a051aa..4739701 100755 --- a/cscripts/cspull.py +++ b/cscripts/cspull.py @@ -51,7 +51,6 @@ class cspull(ctools.cscript): self._ntrials = 0 self._npix = 0 self._binsz = 0.0 - self._pattern = 'single' self._enumbins = 0 self._seed = 1 self._chatter = 2 @@ -75,25 +74,17 @@ class cspull(ctools.cscript): if self._obs.size() == 0: self._obs = self._get_observations() - # Check for requested pattern and use above - # observation parameters to set wobble pattern - self._pattern = self['pattern'].string() - if self._pattern == 'four': - self._obs = obsutils.set_observations(self['ra'].real(), - self['dec'].real(), - self['rad'].real(), - self['tmin'].real(), - self['tmax'].real(), - self['emin'].real(), - self['emax'].real(), - self['irf'].string(), - self['caldb'].string(), + # Check for requested pattern and set wobble pattern + if self['pattern'].string() == 'four': + self._obs = obsutils.set_observations(self['ra'].real(), self['dec'].real(), self['rad'].real(), + self['tmin'].real(), self['tmax'].real(), + self['emin'].real(), self['emax'].real(), + self['irf'].string(), self['caldb'].string(), deadc=self['deadc'].real(), - pattern=self['pattern'].string(), - offset=self['offset'].real()) + pattern=self['pattern'].string(), offset=self['offset'].real()) # ... otherwise add response information and energy boundaries - # in case they are missing. + # in case they are missing else: self._setup_observations(self._obs) diff --git a/cscripts/cstsdist.py b/cscripts/cstsdist.py index e049a22..2411f7e 100755 --- a/cscripts/cstsdist.py +++ b/cscripts/cstsdist.py @@ -60,27 +60,20 @@ class cstsdist(ctools.cscript): # Private methods def _get_parameters(self): """ - Get parameters from parfile and setup the observation. + Get parameters from parfile and setup the observation """ # Set observation if not done before - if self._obs == None or self._obs.size() == 0: + if self._obs.size() == 0: self._obs = self._get_observations() - # Check for requested pattern and use above observation parameters - # to set wobble pattern + # Check for requested pattern and set wobble pattern if self['pattern'].string() == 'four': - self._obs = obsutils.set_observations(self['ra'].real(), - self['dec'].real(), - self['rad'].real(), - self['tmin'].real(), - self['tmax'].real(), - self['emin'].real(), - self['emax'].real(), - self['irf'].string(), - self['caldb'].string(), + self._obs = obsutils.set_observations(self['ra'].real(), self['dec'].real(), self['rad'].real(), + self['tmin'].real(), self['tmax'].real(), + self['emin'].real(), self['emax'].real(), + self['irf'].string(), self['caldb'].string(), deadc=self['deadc'].real(), - pattern=self['pattern'].string(), - offset=self['offset'].real()) + pattern=self['pattern'].string(), offset=self['offset'].real()) # Get source name self._srcname = self['srcname'].string() -- libgit2 0.21.4