fixing tests with SSEDict

Author: katiebreivik

src/cosmic/evolve.py

@@ -261,24 +261,24 @@ def evolve(cls, initialbinarytable, pool=None, **kwargs):
             initialbinarytable = initialbinarytable.assign(randomseed=kwargs.pop('randomseed', seed))
         if 'bin_num' not in initialbinarytable.keys():
             initialbinarytable = initialbinarytable.assign(bin_num=np.arange(idx, idx + len(initialbinarytable)))
-            
-        if SSEDict['stellar_engine'] == 'metisse':
-            for k, v in SSEDict.items():
-                if k in initialbinarytable.keys():
-                    warnings.warn("The value for {0} in initial binary table is being "
-                                "overwritten by the value of {0} from either the params "
-                                "file or the SSEDict.".format(k))
-                # assigning values this way work for most of the parameters.:
 
-                kwargs1 = {k: v}
+        if SSEDict:
+            if SSEDict['stellar_engine'] == 'metisse':
+                for k, v in SSEDict.items():
+                    if k in initialbinarytable.keys():
+                        warnings.warn("The value for {0} in initial binary table is being "
+                                    "overwritten by the value of {0} from either the params "
+                                    "file or the SSEDict.".format(k))
+                    # assigning values this way work for most of the parameters.:
+
+                    kwargs1 = {k: v}
+                    initialbinarytable = initialbinarytable.assign(**kwargs1)
+            elif SSEDict['stellar_engine'] == 'sse':
+                kwargs1 = {'stellar_engine': 'sse'}
                 initialbinarytable = initialbinarytable.assign(**kwargs1)
-        elif SSEDict['stellar_engine'] == 'sse':
-            kwargs1 = {'stellar_engine': 'sse'}
-            initialbinarytable = initialbinarytable.assign(**kwargs1)
-            for col in ['path_to_tracks', 'path_to_he_tracks']:
-                INITIAL_BINARY_TABLE_SAVE_COLUMNS.remove(col)
-                INITIAL_CONDITIONS_PASS_COLUMNS.remove(col)
-
+                for col in ['path_to_tracks', 'path_to_he_tracks']:
+                    kwargs1 = {col: ''}
+                    initialbinarytable = initialbinarytable.assign(**kwargs1)
 
         for k, v in BSEDict.items():
             if k in initialbinarytable.keys():
@@ -338,7 +338,7 @@ def evolve(cls, initialbinarytable, pool=None, **kwargs):
         # and either a dictionary or an inifile was not provided
         # then we need to raise an ValueError and tell the user to provide
         # either a dictionary or an inifile or add more columns
-        if not BSEDict:
+        if BSEDict and SSEDict is None:
             if ((not set(INITIAL_BINARY_TABLE_SAVE_COLUMNS).issubset(initialbinarytable.columns)) and
                (not set(INITIAL_CONDITIONS_PASS_COLUMNS).issubset(initialbinarytable.columns))):
                 raise ValueError("You are passing BSE parameters as columns in the "
@@ -347,14 +347,10 @@ def evolve(cls, initialbinarytable, pool=None, **kwargs):
                                  "you have all BSE parameters as columns {0} or {1}.".format(
                                   INITIAL_BINARY_TABLE_SAVE_COLUMNS, INITIAL_CONDITIONS_PASS_COLUMNS))
 
-        if not SSEDict:
-            if ((not set(INITIAL_BINARY_TABLE_SAVE_COLUMNS).issubset(initialbinarytable.columns)) and
-               (not set(INITIAL_CONDITIONS_PASS_COLUMNS).issubset(initialbinarytable.columns))):
-                raise ValueError("You are passing BSE parameters as columns in the "
-                                 "initial binary table but not all BSE parameters are defined. "
-                                 "Please pass a BSEDict or a params file or make sure "
-                                 "you have all BSE parameters as columns {0} or {1}.".format(
-                                  INITIAL_BINARY_TABLE_SAVE_COLUMNS, INITIAL_CONDITIONS_PASS_COLUMNS))
+        if (BSEDict and not SSEDict) or (SSEDict and not BSEDict):
+            raise ValueError("If you are passing BSE parameters as columns in the "
+                             "initial binary table you must also pass SSE parameters "
+                             "in the initial binary table.")
 
         # If you did not supply the natal kick or qcrit_array or fprimc_array in the BSEdict then we construct
         # it from the initial conditions table
@@ -372,7 +368,7 @@ def evolve(cls, initialbinarytable, pool=None, **kwargs):
             initialbinarytable = initialbinarytable.assign(fprimc_array=initialbinarytable[FPRIMC_COLUMNS].values.tolist())
 
         if (pd.Series(ALPHA_COLUMNS).isin(initialbinarytable.keys()).all()) and ('alpha1' not in BSEDict):
-            initialbinarytable = initialbinarytable.assign(alpha=initialbinarytable[ALPHA_COLUMNS].values.tolist())
+            initialbinarytable = initialbinarytable.assign(alpha1=initialbinarytable[ALPHA_COLUMNS].values.tolist())
 
         if (pd.Series(ACCLIM_COLUMNS).isin(initialbinarytable.keys()).all()) and ('acc_lim' not in BSEDict):
             initialbinarytable = initialbinarytable.assign(acc_lim=initialbinarytable[ACCLIM_COLUMNS].values.tolist())

src/cosmic/tests/data/Params.ini

@@ -74,6 +74,29 @@ bcm_bpp_initCond_filter = False
 seed = 42
 
 
+[sse]
+
+; stellar_engine specifies which engine to use for individual single star
+; evolution. There are two choices: metisse and sse where sse uses the 
+; 'Hurley' tracks fits to the Pols+1998 grid. All results run with COSMIC
+; prior to version 3.5 are equivalent to using sse as the enine
+
+stellar_engine = 'sse'
+
+; path_to_tracks specifies the path to hydrogen rich stellar evolution tracks
+; specified as EEPs (equivalent evolutionary points). If stellar_engine is not 
+; metisse, leave the path as an empty string
+
+path_to_tracks = ''
+
+; path_to_tracks specifies the path to helium-star stellar evolution tracks
+; specified as EEPs (equivalent evolutionary points). If stellar_engine is not 
+; metisse, leave the path as an empty string
+
+path_to_he_tracks = ''
+
+
+
 [bse]
 
 ;;;;;;;;;;;;;;;;;;;;;;
@@ -154,8 +177,10 @@ acc2=1.5
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ; alpha1 is the common-envelope efficiency parameter
-; default=1.0
-alpha1 = 1.0
+; It is a list so we can specify a different ejection efficiencies
+; for the primary and secondary
+; default=[1.0, 1.0]
+alpha1 = [1.0, 1.0]
 
 ; lambdaf is the binding energy factor for common envelope evolution
 ; lambdaf>0.0 uses variable lambda prescription written by Onno Pols
@@ -366,7 +391,8 @@ don_lim = -1
 ; acc_lim = -2: assumes the accretion is limited to tkh_acc for MS/CHeB
 ; acc_lim = -3: assumes the accretion is limited by 10*tkh_acc for all fusing stars
 ; acc_lim = -4: assumes the accretion is limited by tkh_for all fusing stars
-acc_lim = -1
+; it is a list so we can specify different accretion limits for the primary and secondary
+acc_lim = [-1, -1]
 
 ;;;;;;;;;;;;;;;;;;;
 ;;; TIDES FLAGS ;;;

src/cosmic/tests/data/initial_conditions_for_testing.hdf5

@@ -21,7 +21,6 @@
 INIT_CONDITIONS = pd.read_hdf(os.path.join(TEST_DATA_DIR, 'initial_conditions_for_testing.hdf5'), key='initC')
 
 init_conds_columns = initialbinarytable.INITIAL_CONDITIONS_COLUMNS_ALL
-
 INIT_CONDITIONS_NO_BSE_COLUMNS = INIT_CONDITIONS[init_conds_columns]
 BPP_DF = pd.read_hdf(os.path.join(TEST_DATA_DIR, 'unit_tests_results.hdf5'), key='bpp')
 BCM_DF = pd.read_hdf(os.path.join(TEST_DATA_DIR, 'unit_tests_results.hdf5'), key='bcm')
@@ -34,7 +33,7 @@
                            2.0/21.0,2.0/21.0,2.0/21.0,2.0/21.0,2.0/21.0,2.0/21.0]
 BSEDict['grflag'] = 1
 BSEDict['don_lim'] = -1
-BSEDict['acc_lim'] = -1
+BSEDict['acc_lim'] = [-1, -1]
 BSEDict['wd_mass_lim'] = 0
 SSEDict = {'stellar_engine': 'sse'}
 
@@ -46,14 +45,14 @@ def test_single_evolve_with_table(self):
 
         # Check that the sample_primary function samples mass correctly
         EvolvedBinaryBPP, EvolvedBinaryBCM, initCond, kick_info = Evolve.evolve(
-            initialbinarytable=INIT_CONDITIONS, randomseed=523574, SSEDict=SSEDict)
+            initialbinarytable=INIT_CONDITIONS, randomseed=523574)
 
         pd.testing.assert_frame_equal(EvolvedBinaryBPP, BPP_DF, check_dtype=False, check_exact=False)
         pd.testing.assert_frame_equal(EvolvedBinaryBCM, BCM_DF, check_dtype=False, check_exact=False)
 
     def test_single_evolve_with_dict(self):
         EvolvedBinaryBPP, EvolvedBinaryBCM, initCond, kick_info = Evolve.evolve(
-            initialbinarytable=INIT_CONDITIONS_NO_BSE_COLUMNS, BSEDict=BSEDict, randomseed=523574)
+            initialbinarytable=INIT_CONDITIONS_NO_BSE_COLUMNS, BSEDict=BSEDict, SSEDict=SSEDict, randomseed=523574)
 
         pd.testing.assert_frame_equal(EvolvedBinaryBPP, BPP_DF, check_dtype=False, check_exact=False)
         pd.testing.assert_frame_equal(EvolvedBinaryBCM, BCM_DF, check_dtype=False, check_exact=False)
@@ -67,7 +66,7 @@ def test_single_evolve_with_inifile(self):
 
     def test_single_evolve_with_dict_and_table(self):
         EvolvedBinaryBPP, EvolvedBinaryBCM, initCond, kick_info = Evolve.evolve(
-            initialbinarytable=INIT_CONDITIONS, BSEDict=BSEDict, randomseed=523574)
+            initialbinarytable=INIT_CONDITIONS, BSEDict=BSEDict, SSEDict=SSEDict, randomseed=523574)
 
         pd.testing.assert_frame_equal(EvolvedBinaryBPP, BPP_DF, check_dtype=False, check_exact=False)
         pd.testing.assert_frame_equal(EvolvedBinaryBCM, BCM_DF, check_dtype=False, check_exact=False)
@@ -82,7 +81,7 @@ def test_multi_evolve_with_table(self):
 
     def test_multi_evolve_with_dict(self):
         EvolvedBinaryBPP, EvolvedBinaryBCM, initCond, kick_info = Evolve.evolve(
-            initialbinarytable=INIT_CONDITIONS_NO_BSE_COLUMNS, BSEDict=BSEDict, randomseed=523574, n_per_block=100)
+            initialbinarytable=INIT_CONDITIONS_NO_BSE_COLUMNS, BSEDict=BSEDict, SSEDict=SSEDict, randomseed=523574, n_per_block=100)
 
         pd.testing.assert_frame_equal(EvolvedBinaryBPP, BPP_DF, check_dtype=False, check_exact=False)
         pd.testing.assert_frame_equal(EvolvedBinaryBCM, BCM_DF, check_dtype=False, check_exact=False)
@@ -96,7 +95,7 @@ def test_multi_evolve_with_inifile(self):
 
     def test_multi_evolve_with_dict_and_table(self):
         EvolvedBinaryBPP, EvolvedBinaryBCM, initCond, kick_info = Evolve.evolve(
-            initialbinarytable=INIT_CONDITIONS, BSEDict=BSEDict, randomseed=523574, n_per_block=100)
+            initialbinarytable=INIT_CONDITIONS, BSEDict=BSEDict, SSEDict=SSEDict, randomseed=523574, n_per_block=100)
 
         pd.testing.assert_frame_equal(EvolvedBinaryBPP, BPP_DF, check_dtype=False, check_exact=False)
         pd.testing.assert_frame_equal(EvolvedBinaryBCM, BCM_DF, check_dtype=False, check_exact=False)