From c044eed7cb10e31e76c13213e8bb5aef50391bba Mon Sep 17 00:00:00 2001 From: Gordon McCann <43148247+gwm17@users.noreply.github.com> Date: Wed, 15 Dec 2021 14:44:03 -0500 Subject: [PATCH 1/2] Adding license to repo --- LICENSE | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..11391d0 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2021 Gordon McCann + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. From edf25adcab10ecfeadc25d3ce74f1aaa531eb5c8 Mon Sep 17 00:00:00 2001 From: Gordon McCann <43148247+gwm17@users.noreply.github.com> Date: Fri, 28 Jan 2022 14:09:07 -0500 Subject: [PATCH 2/2] Fixed double subtraction of electron masses in FP_kinematics --- src/evb/FP_kinematics.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/evb/FP_kinematics.cpp b/src/evb/FP_kinematics.cpp index 9a558c9..cdb0f5b 100644 --- a/src/evb/FP_kinematics.cpp +++ b/src/evb/FP_kinematics.cpp @@ -61,10 +61,10 @@ double Delta_Z(int ZT, int AT, int ZP, int AP, int ZE, int AE, B /= 10000; //convert to tesla angle *= DEGTORAD; - MT = MASS.FindMass(ZT, AT) - ZT*RESTMASS_ELECTRON*UTOMEV; - MP = MASS.FindMass(ZP, AP) - ZP*RESTMASS_ELECTRON*UTOMEV; - ME = MASS.FindMass(ZE, AE) - ZE*RESTMASS_ELECTRON*UTOMEV; - MR = MASS.FindMass(ZR, AR) - ZR*RESTMASS_ELECTRON*UTOMEV; + MT = MASS.FindMass(ZT, AT); + MP = MASS.FindMass(ZP, AP); + ME = MASS.FindMass(ZE, AE); + MR = MASS.FindMass(ZR, AR); if (MT*MP*ME*MR == 0) { std::cerr << "***WARNING: error loading one or more masses; returning 0\n";