From 0ff09cb3cbad15c293cc7c177fa82732b2b767c5 Mon Sep 17 00:00:00 2001 From: Aaron LI Date: Mon, 4 Jul 2016 17:11:50 +0800 Subject: deproject_sbp.py: use model "report()" method --- deproject_sbp.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/deproject_sbp.py b/deproject_sbp.py index 46dc81c..8cb6988 100755 --- a/deproject_sbp.py +++ b/deproject_sbp.py @@ -6,6 +6,7 @@ # # Change logs: # 2016-07-04: +# * Use model's "report()" method # * Add config "sbpexp_rcut" # * Rename config "sbpexp_rcut*" to "sbpexp_rignore*" # * Save profile radii in unit "kpc" @@ -306,15 +307,13 @@ class SBP: Report the extrapolation model fitting results. """ results = OrderedDict([ - ("bkg", self.bkg), + ("bkg", self.bkg), ("bkg_subtracted", self.bkg_subtracted), - ("rignore", self.rignore), - ("rcut", self.rcut), - ("model", self.plcmodel.name), - ("params", OrderedDict([ - (pn, [par.value, par.min, par.max, par.vary]) - for pn, par in self.plcmodel.params.items() - ])), + ("rignore", self.rignore), + ("rcut", self.rcut), + ("model", self.plcmodel.name), + ("fitting", self.plcmodel.report(rtype="fitting")), + ("params", self.plcmodel.report(rtype="parameters")), ]) results_json = json.dumps(results, indent=2) if outfile is None: -- cgit v1.2.2