Veronika Vodeb / ctools

Commit 6eda1990fa2d6e7b3e11d88423dc3e1e25249e0d

Authored by Andreas Specovius
1 parent 6e29bde1

Src regions input now only via 'srcreg' parameter. Its parameter in the xml obs … 

…def file is no longer supported. (Luigis proposal)
Inline Side-by-side
Showing 1 changed file with 3 additions and 20 deletions
cscripts/csphagen.py
  View file @6eda199
@@ -99,7 +99,6 @@ class csphagen(ctools.csobservation): @@ -99,7 +99,6 @@ class csphagen(ctools.csobservation):
99 elif bkgmethod == 'CUSTOM': 99 elif bkgmethod == 'CUSTOM':
100 100
101 obs_file = self['inobs'].filename() 101 obs_file = self['inobs'].filename()
102 - src_reg_file = gammalib.GFilename()  
103 102
104 # obs def XML: look for region files 103 # obs def XML: look for region files
105 if obs_file.file()[-3:] == 'xml': 104 if obs_file.file()[-3:] == 'xml':
@@ -115,35 +114,22 @@ class csphagen(ctools.csobservation): @@ -115,35 +114,22 @@ class csphagen(ctools.csobservation):
115 114
116 # Get region file path from <observation> body 115 # Get region file path from <observation> body
117 off_regions_file = '' 116 off_regions_file = ''
118 - on_region_file = ''  
119 for entry in elem: 117 for entry in elem:
120 118
121 # <parameter name="OffRegions" file=".."/> contains region file 119 # <parameter name="OffRegions" file=".."/> contains region file
122 if entry.attribute('name') == 'OffRegions': 120 if entry.attribute('name') == 'OffRegions':
123 off_regions_file = entry.attribute('file') 121 off_regions_file = entry.attribute('file')
124 122
125 - # <parameter name="OnRegion" file=".."/> contains region file.  
126 - if entry.attribute('name') == 'OnRegion':  
127 - on_region_file = entry.attribute('file')  
128 -  
129 # Store file paths 123 # Store file paths
130 self._bkg_reg_files[obs_id] = gammalib.GFilename(off_regions_file) 124 self._bkg_reg_files[obs_id] = gammalib.GFilename(off_regions_file)
131 125
132 - if on_region_file != '':  
133 - src_reg_file = gammalib.GFilename(on_region_file)  
134 -  
135 # Not existing bkg region files are set to None (for every obs) 126 # Not existing bkg region files are set to None (for every obs)
136 if not self._bkg_reg_files[obs_id].exists(): 127 if not self._bkg_reg_files[obs_id].exists():
137 self._bkg_reg_files[obs_id] = None 128 self._bkg_reg_files[obs_id] = None
138 129
139 - # Not existing src region files are set to None (one time)  
140 - if not src_reg_file.exists():  
141 - src_reg_file = None  
142 -  
143 else: 130 else:
144 - # event FITS files: query later 1 bkg & 1 src region file 131 + # event FITS files: query later 1 bkg region file
145 self._bkg_reg_files = {0:None} 132 self._bkg_reg_files = {0:None}
146 - src_reg_file = None  
147 133
148 # Query missing bkg region file 134 # Query missing bkg region file
149 if len([True for x in self._bkg_reg_files if self._bkg_reg_files[x] is None]) > 0: 135 if len([True for x in self._bkg_reg_files if self._bkg_reg_files[x] is None]) > 0:
@@ -155,11 +141,8 @@ class csphagen(ctools.csobservation): @@ -155,11 +141,8 @@ class csphagen(ctools.csobservation):
155 # Query bkg region file for single observation 141 # Query bkg region file for single observation
156 self._bkg_reg_files[self._bkg_reg_files.keys()[0]] = self['bkgreg'].filename() 142 self._bkg_reg_files[self._bkg_reg_files.keys()[0]] = self['bkgreg'].filename()
157 143
158 - # Query missing src region file  
159 - if src_reg_file is None:  
160 - src_reg_file = self['srcreg'].filename()  
161 -  
162 - # Set up src (=On) region. Only 1 region is allowed 144 + # Query src region file and set up the region. Only 1 region is allowed.
  145 + src_reg_file = self['srcreg'].filename()
163 self._src_reg = gammalib.GSkyRegions(src_reg_file) 146 self._src_reg = gammalib.GSkyRegions(src_reg_file)
164 147
165 if len(self._src_reg) > 1: 148 if len(self._src_reg) > 1: