Merge lp:~ma5dev/madanalysis5/pyhf_update into lp:~ma5dev/madanalysis5/v1.9_beta

[Jack Y. Araz]

change megneticfield -> magnetic_field

=== modified file 'madanalysis/configuration/clustering_configuration.py'
--- madanalysis/configuration/clustering_configuration.py	2021-11-12 18:23:06 +0000
+++ madanalysis/configuration/clustering_configuration.py	2021-11-16 08:56:41 +0000
@@ -45,7 +45,7 @@
                                      "none"],
                       "exclusive_id"            : ["true","false"],
                       "jetrecomode"             : ["jets","constituents"],
-                      "magneticfield"           : ["3.8"],
+                      "magnetic_field"          : ["3.8"],
                       # "tracker_radius"          : ["1.29"],
                       # "half_length"             : ["3.0"],
                       "particle_propagator"     : ["on","off"],

=== modified file 'madanalysis/interpreter/cmd_set.py'
--- madanalysis/interpreter/cmd_set.py	2021-09-15 14:19:55 +0000
+++ madanalysis/interpreter/cmd_set.py	2021-11-16 08:56:41 +0000
@@ -146,7 +146,7 @@
                     self.main.superfastsim.jetrecomode = args[2]
                 else:
                     logging.getLogger('MA5').error("Jet smearing can only be based on the jet ('jets') or on its constituents ('constituents').")
-            elif objs[2] == 'magneticfield':
+            elif objs[2] == 'magnetic_field':
                 try:
                     self.main.superfastsim.mag_field  = float(args[2])
                     self.main.superfastsim.propagator = True