From 2aab75b7eb29fb76673e5416ed961bcfad545238 Mon Sep 17 00:00:00 2001 From: Luigi Tibaldo Date: Fri, 24 Nov 2017 11:55:56 +0100 Subject: [PATCH] debugged parameter query for On/Off --- cscripts/obsutils.py | 10 +++++----- src/support/ctool.cpp | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cscripts/obsutils.py b/cscripts/obsutils.py index 8dfbe64..a042b22 100755 --- a/cscripts/obsutils.py +++ b/cscripts/obsutils.py @@ -785,7 +785,7 @@ def get_onoff_obs(cls, obs): cls._log.header3('Creating On/Off observations') phagen = cscripts.csphagen(obs) - phagen['inexclusion'] = cls['inexclusion'].filename() + phagen['inexclusion'] = cls['inexclusion'].value() phagen['emin'] = cls['emin'].real() phagen['emax'] = cls['emax'].real() phagen['enumbins'] = cls['enumbins'].integer() @@ -802,11 +802,11 @@ def get_onoff_obs(cls, obs): phagen['rad'] = cls['rad'].real() bkgmethod = cls['bkgmethod'].string() if bkgmethod == 'REFLECTED': - phagen['bkgregmin'] = cls['bkgregmin'].string() - phagen['maxoffset'] = cls['maxoffset'].string() + phagen['bkgregmin'] = cls['bkgregmin'].integer() + phagen['maxoffset'] = cls['maxoffset'].real() phagen['stack'] = True - phagen['emintrue'] = cls['emintrue'].real() - phagen['emaxtrue'] = cls['emaxtrue'].real() + phagen['etruemin'] = cls['etruemin'].real() + phagen['etruemax'] = cls['etruemax'].real() phagen['etruebins'] = cls['etruebins'].integer() phagen.run() diff --git a/src/support/ctool.cpp b/src/support/ctool.cpp index 81548e6..bea123a 100644 --- a/src/support/ctool.cpp +++ b/src/support/ctool.cpp @@ -1230,11 +1230,11 @@ bool ctool::is_onoff(void) } (*this)["maxoffset"].real(); (*this)["etruemin"].real(); - (*this)["etruemx"].real(); + (*this)["etruemax"].real(); (*this)["etruebins"].integer(); } - // Return stacked flag + // Return onoff flag return onoff; } -- libgit2 0.21.4