Merge pull request #46 from xuanxu/fit-5

New fit

Author: xuanxu

README.rst

@@ -145,6 +145,7 @@ The ``dtd_sn`` param in the config file can be set to use any of the available D
 :strolger-fit2: Phi function from Strolger et al (2020) with (ξ, ω, 𝛼) = (110, 1000, 2)
 :strolger-fit3: Phi function from Strolger et al (2020) with (ξ, ω, 𝛼) = (350, 1200, 20)
 :strolger-fit4: Phi function from Strolger et al (2020) with (ξ, ω, 𝛼) = (6000, 6000, -2)
+:strolger-fit5: Phi function from Strolger et al (2020) with (ξ, ω, 𝛼) = (-650, 2200, 1100)
 :strolger-optimized: Phi function from Strolger et al (2020) with (ξ, ω, 𝛼) = (-1518, 51, 50)
 
 Supernovae yields

docs/configuration.rst

@@ -91,6 +91,7 @@ The ``dtd_sn`` param in the config file can be set to use any of the available D
 :strolger-fit2: Phi function from Strolger et al (2020) with (ξ, ω, 𝛼) = (110, 1000, 2)
 :strolger-fit3: Phi function from Strolger et al (2020) with (ξ, ω, 𝛼) = (350, 1200, 20)
 :strolger-fit4: Phi function from Strolger et al (2020) with (ξ, ω, 𝛼) = (6000, 6000, -2)
+:strolger-fit5: Phi function from Strolger et al (2020) with (ξ, ω, 𝛼) = (-650, 2200, 1100)
 :strolger-optimized: Phi function from Strolger et al (2020) with (ξ, ω, 𝛼) = (-1518, 51, 50)
 
 Supernovae yields

src/starmatrix/dtds.py

@@ -34,6 +34,7 @@ def select_dtd(option):
         "strolger-fit2": dtds_strolger["fit_2"],
         "strolger-fit3": dtds_strolger["fit_3"],
         "strolger-fit4": dtds_strolger["fit_4"],
+        "strolger-fit5": dtds_strolger["fit_5"],
         "strolger-optimized": dtds_strolger["optimized"],
     }
     return dtds[option]
@@ -345,5 +346,6 @@ def at_time(self, t):
     "fit_2": Strolger(110, 1000, 2).at_time,
     "fit_3": Strolger(350, 1200, 20).at_time,
     "fit_4": Strolger(6000, 6000, -2).at_time,
+    "fit_5": Strolger(-650, 2200, 1100).at_time,
     "optimized": Strolger(-1518, 51, 50).at_time,
 }

src/starmatrix/sample_input/params.yml

@@ -58,6 +58,7 @@
 #            strolger-fit2 = Phi from Strolger et al (2020) with (ξ, ω, 𝛼) = (110, 1000, 2)
 #            strolger-fit3 = Phi from Strolger et al (2020) with (ξ, ω, 𝛼) = (350, 1200, 20)
 #            strolger-fit4 = Phi from Strolger et al (2020) with (ξ, ω, 𝛼) = (6000, 6000, -2)
+#            strolger-fit5 = Phi from Strolger et al (2020) with (ξ, ω, 𝛼) = (-650, 2200, 1100)
 #            strolger-optimized = Phi from Strolger et al (2020) with (ξ, ω, 𝛼) = (-1518, 51, 50)
 #          ]
 

src/starmatrix/settings.py

@@ -35,7 +35,7 @@
     "imf": ["salpeter", "starburst", "chabrier", "ferrini", "kroupa", "miller_scalo", "maschberger"],
     "dtd_sn": ["rlp", "maoz", "castrillo", "greggio", "chen", "greggio-CDD04", "greggio-CDD1",
                "greggio-WDD04", "greggio-WDD1", "greggio-SDCH", "greggio-SDSCH",
-               "strolger-fit1", "strolger-fit2", "strolger-fit3", "strolger-fit4", "strolger-optimized"],
+               "strolger-fit1", "strolger-fit2", "strolger-fit3", "strolger-fit4", "strolger-fit5", "strolger-optimized"],
     "sn_yields": ["iwa1998",
                   "sei2013",
                   "ln2020",

src/starmatrix/tests/test_dtds.py

@@ -33,7 +33,8 @@ def test_dtds_presence(available_dtds):
 def test_select_dtd(available_dtds):
     dtds = [dtd_ruiz_lapuente, dtd_maoz_graur, dtd_castrillo, dtd_greggio, dtd_chen,
             dtd_close_dd_04, dtd_close_dd_1, dtd_wide_dd_04, dtd_wide_dd_1, dtd_sd_chandra, dtd_sd_subchandra,
-            dtds_strolger["fit_1"], dtds_strolger["fit_2"], dtds_strolger["fit_3"], dtds_strolger["fit_4"], dtds_strolger["optimized"]]
+            dtds_strolger["fit_1"], dtds_strolger["fit_2"], dtds_strolger["fit_3"], dtds_strolger["fit_4"],
+            dtds_strolger["fit_5"], dtds_strolger["optimized"]]
 
     assert len(available_dtds) == len(dtds)