Update foresee sample config to 13.6 TeV and add ability to sample hists in 1 or 2D

Two changes:

• Updated foresee config to ECoM = 13.6 TeV
• Allow sampling energy with 1D hist or energy vs theta with 2D hist via 1D: --sampler hist --hist_name filename.root:histname 2D: --sampler hist2D --hist_name filename.root:histname --angle None

Control/CalypsoExample/Generation/python/faser_parser.py

@@ -4,6 +4,13 @@
 #
 # Parser function for particle gun samples
 #
+
+def float_or_none(arg):
+    if arg is None or arg == "None":
+        return None
+
+    return float(arg)
+
 def faser_pgparser():
 
     import sys
@@ -35,13 +42,16 @@ def faser_pgparser():
                         help="Specify particle mass (in MeV)")
     parser.add_argument("--radius", default=100., type=float,
                         help="Specify radius (in mm)")
-    parser.add_argument("--angle", default=0.005, type=float,
+    parser.add_argument("--angle", default=0.005, type=float_or_none,
                         help="Specify angular width (in Rad)")
     parser.add_argument("--zpos", default=None, type=float,
                         help="Specify z position of particles (in mm) (helpful to avoid FASERnu)")
 
     parser.add_argument("--sampler", default="log",
-                        help="Specify energy sampling (log, lin, const)")
+                        help="Specify energy sampling (log, lin, const, hist, hist2D)")
+    parser.add_argument("--hist_name", default="log",
+                        help="Specify energy sampling name for hist sampler file.root:hist")
+    
     parser.add_argument("--minE", default=10., type=float,
                         help="Minimum energy in GeV (for log or lin sampler)")
     parser.add_argument("--maxE", default=1000., type=float,