fixed min specific alpha ejection functions

OpenThermochronology · Apr 19, 2024 · 513da54 · 513da54
1 parent e32ebcb
commit 513da54
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/pythermo/crystal.py b/src/pythermo/crystal.py
@@ -587,7 +587,7 @@ def get_rho_r_array(self):
         return self.__rho_r_array
 
     def zircon_alpha_ejection(self):
-        self.alpha_ejection(self.__radius,self.__nodes,self.__r_step,self.__U_ppm,self.__Th_ppm,self.__Sm_ppm,'zircon')
+        return self.alpha_ejection(self.__radius,self.__nodes,self.__r_step,self.__U_ppm,self.__Th_ppm,self.__Sm_ppm,'zircon')
 
     def guenthner_damage(self):
         """
@@ -763,7 +763,7 @@ def get_rho_r_array(self):
         return self.__rho_r_array
 
     def apatite_alpha_ejection(self):
-        self.alpha_ejection(self.__radius,self.__nodes,self.__r_step,self.__U_ppm,self.__Th_ppm,self.__Sm_ppm,'apatite')
+        return self.alpha_ejection(self.__radius,self.__nodes,self.__r_step,self.__U_ppm,self.__Th_ppm,self.__Sm_ppm,'apatite')
 
     def flowers_damage(self):
         """

diff --git a/tests/test_crystal.py b/tests/test_crystal.py
@@ -132,7 +132,7 @@ def test_ap_He_date(ap):
     lambda_147_yr = 6.54*10**-12
 
     total_He = ft_U238*(np.exp(lambda_238_yr*date_guess)-1)+ft_U235*(np.exp(lambda_235_yr*date_guess)-1)+ft_Th*(np.exp(lambda_232_yr*date_guess)-1)+ft_Sm*(np.exp(lambda_147_yr*date_guess)-1)
-    date = zirc.He_date(total_He)
+    date = zirc.He_date(total_He, corr_factors)
 
     assert math.isclose(date,date_guess,rel_tol=.001)
 
@@ -151,14 +151,14 @@ def test_zirc_He_date(zirc):
     lambda_147_yr = 6.54*10**-12
 
     total_He = ft_U238*(np.exp(lambda_238_yr*date_guess)-1)+ft_U235*(np.exp(lambda_235_yr*date_guess)-1)+ft_Th*(np.exp(lambda_232_yr*date_guess)-1)+ft_Sm*(np.exp(lambda_147_yr*date_guess)-1)
-    date = zirc.He_date(total_He)
+    date = zirc.He_date(total_He, corr_factors)
 
     assert math.isclose(date,date_guess,rel_tol=.001)
 
 def test_guenthner_damage(zirc):
     damage = zirc.guenthner_damage()
     relevant_tT = zirc.get_relevant_tT()
-    assert np.size(damage) == np.size(relevant_tT,0)
+    assert np.size(damage)+1 == np.size(relevant_tT,0)
     assert np.isnan(damage).any() == False
     assert np.any(damage < 0) == False
 
@@ -170,7 +170,7 @@ def test_guenthner_date(zirc):
 def test_flowers_damage(ap):
     damage = ap.flowers_damage()
     relevant_tT = ap.get_relevant_tT()
-    assert np.size(damage) == np.size(relevant_tT,0)
+    assert np.size(damage)+1 == np.size(relevant_tT,0)
     assert np.isnan(damage).any() == False
     assert np.any(damage < 0) == False