diff --git a/RMtools_1D/do_QUfit_1D_mnest.py b/RMtools_1D/do_QUfit_1D_mnest.py index 2302da4..f838ad8 100644 --- a/RMtools_1D/do_QUfit_1D_mnest.py +++ b/RMtools_1D/do_QUfit_1D_mnest.py @@ -510,13 +510,13 @@ def run_qufit( } for k, v in saveDict.items(): - if isinstance(v, np.float_): + if isinstance(v, (np.float64, float)): saveDict[k] = float(v) - elif isinstance(v, np.int_): + elif isinstance(v, (np.int64, int)): saveDict[k] = int(v) elif isinstance(v, np.ndarray): saveDict[k] = v.tolist() - elif isinstance(v, np.bool_): + elif isinstance(v, (np.bool_, bool)): saveDict[k] = bool(v) json.dump(saveDict, open(outFile, "w")) outFile = f"{prefixOut}_m{modelNum}_{sampler}.dat" diff --git a/RMtools_1D/do_RMclean_1D.py b/RMtools_1D/do_RMclean_1D.py index 17bcc5c..612afbe 100755 --- a/RMtools_1D/do_RMclean_1D.py +++ b/RMtools_1D/do_RMclean_1D.py @@ -324,13 +324,13 @@ def saveOutput(mDict_cl, aDict_cl, prefixOut="", verbose=False, log=print): if verbose: log("> %s" % outFile) for k, v in mDict_cl.items(): - if isinstance(v, np.float_): + if isinstance(v, (np.float64, float)): mDict_cl[k] = float(v) - elif isinstance(v, np.int_): + elif isinstance(v, (np.int64, int)): mDict_cl[k] = int(v) elif isinstance(v, np.ndarray): mDict_cl[k] = v.tolist() - elif isinstance(v, np.bool_): + elif isinstance(v, (np.bool_, bool)): mDict_cl[k] = bool(v) json.dump(mDict_cl, open(outFile, "w")) diff --git a/RMtools_1D/do_RMsynth_1D.py b/RMtools_1D/do_RMsynth_1D.py index ba2f7dc..9eb122e 100755 --- a/RMtools_1D/do_RMsynth_1D.py +++ b/RMtools_1D/do_RMsynth_1D.py @@ -643,13 +643,13 @@ def saveOutput(outdict, arrdict, prefixOut, verbose): print("> %s" % outFile) for k, v in outdict.items(): - if isinstance(v, np.float_): + if isinstance(v, (np.float64, float)): outdict[k] = float(v) - elif isinstance(v, np.int_): + elif isinstance(v, (np.int64, int)): outdict[k] = int(v) elif isinstance(v, np.ndarray): outdict[k] = v.tolist() - elif isinstance(v, np.bool_): + elif isinstance(v, (np.bool_, bool)): outdict[k] = bool(v) json.dump(dict(outdict), open(outFile, "w")) diff --git a/RMtools_3D/RMpeakfit_3D.py b/RMtools_3D/RMpeakfit_3D.py index 7844cbe..9a45f19 100644 --- a/RMtools_3D/RMpeakfit_3D.py +++ b/RMtools_3D/RMpeakfit_3D.py @@ -228,7 +228,7 @@ def save_maps(map_dict, prefix_path, FDFheader): # per product, customize FITS header as needed and save file for product in map_dict.keys(): - if map_dict[product].dtype == np.float_: + if map_dict[product].dtype == np.float64: data = map_dict[product].astype(np.float32) else: data = map_dict[product]