Iftach Sadeh / ctools

Commit 2bf6870d6002c60b030a4d0b17b81b72adeeb5c7

Authored by Luigi Tibaldo
1 parent 804d33fb

fix to parameter query

Inline Side-by-side
Showing 1 changed file with 7 additions and 7 deletions
cscripts/obsutils.py
  View file @2bf6870
@@ -791,17 +791,17 @@ def get_onoff_obs(cls, obs): @@ -791,17 +791,17 @@ def get_onoff_obs(cls, obs):
791 phagen['enumbins'] = cls['enumbins'].integer() 791 phagen['enumbins'] = cls['enumbins'].integer()
792 phagen['ebinalg'] = 'LOG' 792 phagen['ebinalg'] = 'LOG'
793 phagen['srcshape'] = cls['srcshape'].string() 793 phagen['srcshape'] = cls['srcshape'].string()
794 - coordsys = cls['coordsys'].string()  
795 - phagen['coordsys'] = coordsys  
796 - if coordsys == 'CEL': 794 + phagen['coordsys'] = cls['coordsys'].string()
  795 + if cls['coordsys'].string() == 'CEL':
797 phagen['ra'] = cls['xref'].real() 796 phagen['ra'] = cls['xref'].real()
798 phagen['dec'] = cls['yref'].real() 797 phagen['dec'] = cls['yref'].real()
799 - elif coordsys == 'GAL': 798 + elif cls['coordsys'].string() == 'GAL':
800 phagen['glon'] = cls['xref'].real() 799 phagen['glon'] = cls['xref'].real()
801 phagen['glat'] = cls['yref'].real() 800 phagen['glat'] = cls['yref'].real()
802 - phagen['rad'] = cls['rad'].real()  
803 - bkgmethod = cls['bkgmethod'].string()  
804 - if bkgmethod == 'REFLECTED': 801 + if cls['srcshape'].string() == 'CIRCLE':
  802 + phagen['rad'] = cls['rad'].real()
  803 + phagen['bkgmethod'] = cls['bkgmethod'].string()
  804 + if cls['bkgmethod'].string() == 'REFLECTED':
805 phagen['bkgregmin'] = cls['bkgregmin'].integer() 805 phagen['bkgregmin'] = cls['bkgregmin'].integer()
806 phagen['maxoffset'] = cls['maxoffset'].real() 806 phagen['maxoffset'] = cls['maxoffset'].real()
807 phagen['stack'] = True 807 phagen['stack'] = True