diff --git a/cscripts/csresmap.py b/cscripts/csresmap.py index 806c2bd..3136ee3 100755 --- a/cscripts/csresmap.py +++ b/cscripts/csresmap.py @@ -107,15 +107,18 @@ class csresmap(ctools.cscript): if not self._skip_binning: self['xref'].real() self['yref'].real() - self['emin'].real() - self['emax'].real() - self['enumbins'].integer() - self['ebinalg'].string() self['coordsys'].string() self['proj'].string() self['nxpix'].integer() self['nypix'].integer() self['binsz'].real() + self['ebinalg'].string() + if self['ebinalg'].string() == "FILE": + self['ebinfile'].filename() + else: + self['emin'].real() + self['emax'].real() + self['enumbins'].integer() # Query parameters self['edisp'].boolean() @@ -178,17 +181,20 @@ class csresmap(ctools.cscript): # Create countsmap bin = ctools.ctbin(self._obs) - bin['nxpix'] = self['nxpix'].integer() - bin['nypix'] = self['nypix'].integer() - bin['proj'] = self['proj'].string() - bin['coordsys'] = self['coordsys'].string() bin['xref'] = self['xref'].real() bin['yref'] = self['yref'].real() - bin['enumbins'] = self['enumbins'].integer() + bin['proj'] = self['proj'].string() + bin['coordsys'] = self['coordsys'].string() bin['ebinalg'] = self['ebinalg'].string() - bin['emin'] = self['emin'].real() - bin['emax'] = self['emax'].real() + bin['nxpix'] = self['nxpix'].integer() + bin['nypix'] = self['nypix'].integer() bin['binsz'] = self['binsz'].real() + if self['ebinalg'].string() == "FILE": + bin['ebinfile'] = self['ebinfile'].filename().file() + else: + bin['enumbins'] = self['enumbins'].integer() + bin['emin'] = self['emin'].real() + bin['emax'] = self['emax'].real() bin['chatter'] = self['chatter'].integer() bin['clobber'] = self['clobber'].boolean() bin['debug'] = self['debug'].boolean()