Add tests for all the AME 2020 files and fix errors

Author: php1ic

pynch/ame_mass_file.py

@@ -34,7 +34,7 @@ def __init__(self, year: int):
             self.END_A = 19
             self.START_Z = 11
             self.END_Z = 14
-            self.START_ME = 30
+            self.START_ME = 29
             self.END_ME = 41
             self.START_DME = 43
             self.END_DME = 53
@@ -47,6 +47,6 @@ def __init__(self, year: int):
             self.START_DBETA_DECAY_ENERGY = 95
             self.END_DBETA_DECAY_ENERGY = 104
             self.START_MICRO_U = 110
-            self.END_MICRO_U = 111
+            self.END_MICRO_U = 120
             self.START_MICRO_DU = 124
             self.END_MICRO_DU = 135

pynch/ame_reaction_1_file.py

@@ -47,9 +47,9 @@ def __init__(self, year: int):
             self.START_DS2N = 25
             self.END_DS2N = 34
             self.START_S2P = 36
-            self.END_S2P = 45
+            self.END_S2P = 46
             self.START_DS2P = 47
-            self.END_DS2P = 55
+            self.END_DS2P = 56
             self.START_QA = 58
             self.END_QA = 68
             self.START_DQA = 69

pynch/ame_reaction_2_file.py

@@ -47,10 +47,10 @@ def __init__(self, year: int):
             self.START_DSN = 25
             self.END_DSN = 34
             self.START_SP = 36
-            self.END_SP = 45
+            self.END_SP = 46
             self.START_DSP = 47
-            self.END_DSP = 55
-            self.START_Q4B = 58
+            self.END_DSP = 56
+            self.START_Q4B = 57
             self.END_Q4B = 68
             self.START_DQ4B = 69
             self.END_DQ4B = 78

tests/test_ame_mass_parse.py

@@ -18,3 +18,20 @@ def test_read_line():
     assert d['BetaDecayEnergyError'] == 523.438
     assert d['AtomicMass'] == 950947.244
     assert d['AtomicMassError'] == 446.132
+
+    parser = AMEMassParser(".", 2020)
+
+    line = "  15   41   26   67 Fe    x  -45708.416       3.819      8449.9359     0.0570  B-   9613.3678     7.4900   66 950930.000       4.100"
+    d = parser._read_line(line)
+
+    assert d['A'] == 67
+    assert d['Z'] == 26
+    assert d['N'] == 41
+    assert d['AMEMassExcess'] == -45708.416
+    assert d['AMEMassExcessError'] == 3.819
+    assert d['BindingEnergyPerA'] == 8449.9359
+    assert d['BindingEnergyPerAError'] == 0.0570
+    assert d['BetaDecayEnergy'] == 9613.3678
+    assert d['BetaDecayEnergyError'] == 7.4900
+    assert d['AtomicMass'] == 950930.00
+    assert d['AtomicMassError'] == 4.100

tests/test_ame_reaction_1_parse.py

@@ -23,3 +23,25 @@ def test_read_line():
     assert d['QEpsilonError'] == 16.57
     assert d['QBetaNeutron'] == -10561.10
     assert d['QBetaNeutronError'] == 44.19
+
+    parser = AMEReactionParserOne(".", 2020)
+
+    line = " 186 Ir  77   15704.1312   32.4655   9530.4731   17.0698   3848.8777  103.3133  -7457.4943   26.6968  -2642.2739   16.5459 -10555.5245   30.6658"
+
+    d = parser._read_line(line)
+
+    assert d['A'] == 186
+    assert d['Z'] == 77
+    assert d['N'] == 109
+    assert d['TwoNeutronSeparationEnergy'] == 15704.1312
+    assert d['TwoNeutronSeparationEnergyError'] == 32.4655
+    assert d['TwoProtonSeparationEnergy'] == 9530.4731
+    assert d['TwoProtonSeparationEnergyError'] == 17.0698
+    assert d['QAlpha'] == 3848.8777
+    assert d['QAlphaError'] == 103.3133
+    assert d['QTwoBeta'] == -7457.4943
+    assert d['QTwoBetaError'] == 26.6968
+    assert d['QEpsilon'] == -2642.2739
+    assert d['QEpsilonError'] == 16.5459
+    assert d['QBetaNeutron'] == -10555.5245
+    assert d['QBetaNeutronError'] == 30.6658

tests/test_ame_reaction_2_parse.py

@@ -23,3 +23,25 @@ def test_read_line():
     assert d['QProtonAlphaError'] == 1.16
     assert d['QNeutronAlpha'] == 7701.54
     assert d['QNeutronAlphaErrror'] == 3.34
+
+    parser = AMEReactionParserTwo(".", 2020)
+
+    line = " 204 Tl  81    6656.0787    0.2907   6365.8379    1.2542 -12470.8182   22.6974  13710.0469    1.0612   8180.5147    1.0721   7701.0380    3.3084"
+
+    d = parser._read_line(line)
+
+    assert d['A'] == 204
+    assert d['Z'] == 81
+    assert d['N'] == 123
+    assert d['OneNeutronSeparationEnergy'] == 6656.0787
+    assert d['OneNeutronSeparationEnergyError'] == 0.2907
+    assert d['OneProtonSeparationEnergy'] == 6365.8379
+    assert d['OneProtonSeparationEnergyError'] == 1.2542
+    assert d['QFourBeta'] == -12470.8182
+    assert d['QFourBetaError'] == 22.6974
+    assert d['QDeuteronAlpha'] == 13710.0469
+    assert d['QDeuteronAlphaError'] == 1.0612
+    assert d['QProtonAlpha'] == 8180.5147
+    assert d['QProtonAlphaError'] == 1.0721
+    assert d['QNeutronAlpha'] == 7701.0380
+    assert d['QNeutronAlphaErrror'] == 3.3084