Commit 394d719a6d18e43c7010b5265fed1528d7835530
1 parent
a20895b3
corrected bug for csresmap
Showing
1 changed file
with
17 additions
and
11 deletions
cscripts/csresmap.py
| ... | ... | @@ -107,15 +107,18 @@ class csresmap(ctools.cscript): |
| 107 | 107 | if not self._skip_binning: |
| 108 | 108 | self['xref'].real() |
| 109 | 109 | self['yref'].real() |
| 110 | - self['emin'].real() | |
| 111 | - self['emax'].real() | |
| 112 | - self['enumbins'].integer() | |
| 113 | - self['ebinalg'].string() | |
| 114 | 110 | self['coordsys'].string() |
| 115 | 111 | self['proj'].string() |
| 116 | 112 | self['nxpix'].integer() |
| 117 | 113 | self['nypix'].integer() |
| 118 | 114 | self['binsz'].real() |
| 115 | + self['ebinalg'].string() | |
| 116 | + if self['ebinalg'].string() == "FILE": | |
| 117 | + self['ebinfile'].filename() | |
| 118 | + else: | |
| 119 | + self['emin'].real() | |
| 120 | + self['emax'].real() | |
| 121 | + self['enumbins'].integer() | |
| 119 | 122 | |
| 120 | 123 | # Query parameters |
| 121 | 124 | self['edisp'].boolean() |
| ... | ... | @@ -178,17 +181,20 @@ class csresmap(ctools.cscript): |
| 178 | 181 | |
| 179 | 182 | # Create countsmap |
| 180 | 183 | bin = ctools.ctbin(self._obs) |
| 181 | - bin['nxpix'] = self['nxpix'].integer() | |
| 182 | - bin['nypix'] = self['nypix'].integer() | |
| 183 | - bin['proj'] = self['proj'].string() | |
| 184 | - bin['coordsys'] = self['coordsys'].string() | |
| 185 | 184 | bin['xref'] = self['xref'].real() |
| 186 | 185 | bin['yref'] = self['yref'].real() |
| 187 | - bin['enumbins'] = self['enumbins'].integer() | |
| 186 | + bin['proj'] = self['proj'].string() | |
| 187 | + bin['coordsys'] = self['coordsys'].string() | |
| 188 | 188 | bin['ebinalg'] = self['ebinalg'].string() |
| 189 | - bin['emin'] = self['emin'].real() | |
| 190 | - bin['emax'] = self['emax'].real() | |
| 189 | + bin['nxpix'] = self['nxpix'].integer() | |
| 190 | + bin['nypix'] = self['nypix'].integer() | |
| 191 | 191 | bin['binsz'] = self['binsz'].real() |
| 192 | + if self['ebinalg'].string() == "FILE": | |
| 193 | + bin['ebinfile'] = self['ebinfile'].filename().file() | |
| 194 | + else: | |
| 195 | + bin['enumbins'] = self['enumbins'].integer() | |
| 196 | + bin['emin'] = self['emin'].real() | |
| 197 | + bin['emax'] = self['emax'].real() | |
| 192 | 198 | bin['chatter'] = self['chatter'].integer() |
| 193 | 199 | bin['clobber'] = self['clobber'].boolean() |
| 194 | 200 | bin['debug'] = self['debug'].boolean() | ... | ... |