Merge branch 'development'

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])