From 950a1add37cd74c61ca4ab09746909645cafa7ed Mon Sep 17 00:00:00 2001 From: Philipp Oleynik <pholey@utu.fi> Date: Wed, 12 Feb 2020 15:34:15 +0200 Subject: [PATCH] Birks correction limited to 100 MeV --- .idea/other.xml | 6 ++++++ sixsutils.py | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 .idea/other.xml diff --git a/.idea/other.xml b/.idea/other.xml new file mode 100644 index 0000000..a708ec7 --- /dev/null +++ b/.idea/other.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="PySciProjectComponent"> + <option name="PY_SCI_VIEW_SUGGESTED" value="true" /> + </component> +</project> \ No newline at end of file diff --git a/sixsutils.py b/sixsutils.py index 48dec75..661ee0c 100644 --- a/sixsutils.py +++ b/sixsutils.py @@ -57,7 +57,10 @@ def birks_correction(energy): # Birks coefficient and parameter estimates taken :return: Corrected energy in Mev """ kbirks = 0.68E-3 - return energy * (1 - scs.hyp2f1(1, 1 / 0.678, 1 + 1 / 0.678, -np.power(energy, 0.678) / (95 * kbirks))) + if energy > 100: + return energy + else: + return energy * (1 - scs.hyp2f1(1, 1 / 0.678, 1 + 1 / 0.678, -np.power(energy, 0.678) / (95 * kbirks))) def core_energy_to_64(energy): -- GitLab