From 40856da8bfc6d53888fb71caa436ad0e818df48b Mon Sep 17 00:00:00 2001 From: leloup314 Date: Sun, 21 Aug 2022 20:36:49 +0200 Subject: [PATCH 1/2] MAINT: update values according to values from http://nucleardata.nuclear.lu.se/toi/radSearch.asp --- irrad_spectroscopy/tables/gamma_table.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/irrad_spectroscopy/tables/gamma_table.yaml b/irrad_spectroscopy/tables/gamma_table.yaml index d137570..d6b9d27 100644 --- a/irrad_spectroscopy/tables/gamma_table.yaml +++ b/irrad_spectroscopy/tables/gamma_table.yaml @@ -153,10 +153,10 @@ isotopes: - 944.132 - 2240.395 probability: - - 0.5022099999999999 - - 0.48965000000000003 - - 0.03897 - - 0.0121 + - 0.9998 + - 0.9758 + - 0.0776 + - 0.02414 Cr: name: Chromium Z: 24 From 79aed13c8f01cbe445c07215897ff03309d41240 Mon Sep 17 00:00:00 2001 From: leloup314 Date: Mon, 22 Aug 2022 11:43:00 +0200 Subject: [PATCH 2/2] FIX: bug in fluence calculation when scaling for time between meas and irrad; MAINT: spelling --- irrad_spectroscopy/physics.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/irrad_spectroscopy/physics.py b/irrad_spectroscopy/physics.py index 79ba882..5b738a7 100644 --- a/irrad_spectroscopy/physics.py +++ b/irrad_spectroscopy/physics.py @@ -142,7 +142,7 @@ def isotope_dose_rate(isotope, activity, distance, material='air', time=None): return total_dose_rate -def fluence_from_activity(isotope, acticity, cross_section, molar_mass, sample_mass, abundance=1.0, cooldown_time=0.0): +def fluence_from_activity(isotope, activity, cross_section, molar_mass, sample_mass, abundance=1.0, cooldown_time=0.0): """ Calculation of the theoretical particle fluence [# particles / cm^2] which produced a given *activity* of an *isotope* with a production *cross_section* in a given, thin (e.g. *cross_section* const.) *sample_mass*. @@ -184,7 +184,7 @@ def fluence_from_activity(isotope, acticity, cross_section, molar_mass, sample_m sample_mass_in_grams *= abundance # Correct for abundance in material dc = decay_constant(half_life) - fluence = acticity / cross_section_in_cm_square * molar_mass / (sample_mass_in_grams * 6.02214076e23) * 1 / dc - fluence *= np.exp(-dc * cooldown_time * 60**2) # Correct for time passed since activity was produced + fluence = activity / cross_section_in_cm_square * molar_mass / (sample_mass_in_grams * 6.02214076e23) / dc + fluence /= np.exp(-dc * cooldown_time * 60**2) # Correct for time passed since activity was produced return fluence