Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions RMtools_1D/do_QUfit_1D_mnest.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions RMtools_1D/do_RMclean_1D.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down
6 changes: 3 additions & 3 deletions RMtools_1D/do_RMsynth_1D.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down
2 changes: 1 addition & 1 deletion RMtools_3D/RMpeakfit_3D.py
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
Loading