From 5ca387d47ba712dc5a82ce85668b4861a0bad9b4 Mon Sep 17 00:00:00 2001
From: David Hendriks <davidhendriks93@gmail.com>
Date: Sat, 4 Sep 2021 19:47:24 +0100
Subject: [PATCH] updated function to be able to merge astropy arrays
---
binarycpython/utils/functions.py | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/binarycpython/utils/functions.py b/binarycpython/utils/functions.py
index 5a1caf4ce..32acf5c0d 100644
--- a/binarycpython/utils/functions.py
+++ b/binarycpython/utils/functions.py
@@ -29,6 +29,8 @@ from collections import (
import h5py
import numpy as np
+import astropy.units as u
+
from binarycpython import _binary_c_bindings
import binarycpython.utils.moe_di_stefano_2017_data as moe_di_stefano_2017_data
@@ -1635,6 +1637,10 @@ def merge_dicts(dict_1: dict, dict_2: dict) -> dict:
elif isinstance(dict_1[key], list) and isinstance(dict_2[key], list):
new_dict[key] = dict_1[key] + dict_2[key]
+ # Astropy quantities (using a dummy type representing the numpy array)
+ elif isinstance(dict_1[key], type(np.array([1])*u.m)) and isinstance(dict_2[key], type(np.array([1])*u.m)):
+ new_dict[key] = dict_1[key] + dict_2[key]
+
# dicts
elif isinstance(dict_1[key], dict) and isinstance(dict_2[key], dict):
new_dict[key] = merge_dicts(dict_1[key], dict_2[key])
--
GitLab