diff options
| -rwxr-xr-x | calc_pei.py | 2 | ||||
| -rwxr-xr-x | calc_radial_psd.py | 2 | ||||
| -rwxr-xr-x | calc_sbp_excess.py | 16 |
3 files changed, 13 insertions, 7 deletions
diff --git a/calc_pei.py b/calc_pei.py index 3662b9d..961c19c 100755 --- a/calc_pei.py +++ b/calc_pei.py @@ -311,7 +311,7 @@ def main(): ("pei_median", pei_err["pei_median"]), ("pei_q25", pei_err["pei_q25"]), ("pei_q75", pei_err["pei_q75"]), - ("mctimes", args.mctimes), + ("mc_times", args.mctimes), ]) pei_data_json = json.dumps(pei_data, indent=2) print(pei_data_json) diff --git a/calc_radial_psd.py b/calc_radial_psd.py index 3f3508a..8f59a13 100755 --- a/calc_radial_psd.py +++ b/calc_radial_psd.py @@ -164,7 +164,7 @@ class PSD: self.psd1d = radial_psd self.psd1d_err = radial_psd_err if verbose: - print("DONE", end="", flush=True) + print("DONE", flush=True) return (freqs, radial_psd, radial_psd_err) @staticmethod diff --git a/calc_sbp_excess.py b/calc_sbp_excess.py index 9df31a9..2f376d4 100755 --- a/calc_sbp_excess.py +++ b/calc_sbp_excess.py @@ -3,9 +3,11 @@ # # Aaron LI # Created: 2016-04-26 -# Updated: 2016-05-17 +# Updated: 2016-05-18 # # Change log: +# 2016-05-18: +# * Update output results # 2016-05-17: # * Add argument "--subtract-bkg" and consider background subtraction # * Add argument "--r500-cut" and `rcut` support @@ -35,8 +37,8 @@ from configobj import ConfigObj from fit_sbp import make_model, make_sbpfit -__version__ = "0.3.1" -__date__ = "2016-05-17" +__version__ = "0.3.2" +__date__ = "2016-05-18" def calc_excess(data, fitted_model, rcut=None, @@ -74,7 +76,8 @@ def calc_excess(data, fitted_model, rcut=None, print("DEBUG: ncut:", ncut, file=sys.stderr) print("DEBUG: rin:", rin, file=sys.stderr) print("DEBUG: rout:", rout, file=sys.stderr) - print("DEBUG: brightness:", brightness, file=sys.stderr) + else: + rcut = rout[-1] if subtract_bkg: bkg = fitted_model.get_param("bkg").value if verbose: @@ -87,6 +90,8 @@ def calc_excess(data, fitted_model, rcut=None, excess_value = bsum_obs - bsum_model excess_ratio = excess_value / bsum_obs excess = { + "excess_rcut": rcut, + "subtract_bkg": subtract_bkg, "brightness_obs": bsum_obs, "brightness_model": bsum_model, "excess_value": excess_value, @@ -225,7 +230,8 @@ def main(): ("name", config["name"]), ("obsid", int(config["obsid"])), ("model", modelname), - ("excess_rcut", rcut), + ("excess_rcut", excess["excess_rcut"]), + ("subtract_bkg", excess["subtract_bkg"]), ("brightness_obs", excess["brightness_obs"]), ("brightness_model", excess["brightness_model"]), ("excess_value", excess["excess_value"]), |