From 74089aa75d6196f5d02e414b09d5460de8266daf Mon Sep 17 00:00:00 2001
From: Eric Torrence <eric.torrence@cern.ch>
Date: Fri, 10 Jun 2022 05:32:42 +0200
Subject: [PATCH] Adjust default angle for PG samples, new samples
---
.../mdc/FaserMC-MDC_PG_elec_100GeV-101104.json | 14 ++++++++++++++
.../mdc/FaserMC-MDC_PG_elec_200GeV-101106.json | 13 +++++++++++++
.../data/mdc/FaserMC-MDC_PG_elec_50GeV-101105.json | 13 +++++++++++++
.../mdc/FaserMC-MDC_PG_muon_100GeV-101304.json | 14 ++++++++++++++
.../Generation/python/faserMDC_parser.py | 2 +-
.../Generation/scripts/faserMDC_particlegun.py | 2 +-
6 files changed, 56 insertions(+), 2 deletions(-)
create mode 100644 Control/CalypsoExample/Generation/data/mdc/FaserMC-MDC_PG_elec_100GeV-101104.json
create mode 100644 Control/CalypsoExample/Generation/data/mdc/FaserMC-MDC_PG_elec_200GeV-101106.json
create mode 100644 Control/CalypsoExample/Generation/data/mdc/FaserMC-MDC_PG_elec_50GeV-101105.json
create mode 100644 Control/CalypsoExample/Generation/data/mdc/FaserMC-MDC_PG_muon_100GeV-101304.json
diff --git a/Control/CalypsoExample/Generation/data/mdc/FaserMC-MDC_PG_elec_100GeV-101104.json b/Control/CalypsoExample/Generation/data/mdc/FaserMC-MDC_PG_elec_100GeV-101104.json
new file mode 100644
index 00000000..fafd471d
--- /dev/null
+++ b/Control/CalypsoExample/Generation/data/mdc/FaserMC-MDC_PG_elec_100GeV-101104.json
@@ -0,0 +1,14 @@
+{
+ "file_length": 1000,
+ "mass": 0.511,
+ "maxE": 100.0,
+ "minE": 100.0,
+ "pid": [-11, 11],
+ "radius": -20.0,
+ "angle": 0.001,
+ "run": 101104,
+ "sampler": "const",
+ "segment": 0,
+ "short": "MDC_PG_elec_100GeV",
+ "zpos": -1000.0
+}
diff --git a/Control/CalypsoExample/Generation/data/mdc/FaserMC-MDC_PG_elec_200GeV-101106.json b/Control/CalypsoExample/Generation/data/mdc/FaserMC-MDC_PG_elec_200GeV-101106.json
new file mode 100644
index 00000000..bac12229
--- /dev/null
+++ b/Control/CalypsoExample/Generation/data/mdc/FaserMC-MDC_PG_elec_200GeV-101106.json
@@ -0,0 +1,13 @@
+{
+ "file_length": 1000,
+ "mass": 0.511,
+ "maxE": 200.0,
+ "minE": 200.0,
+ "pid": [-11, 11],
+ "radius": -100.0,
+ "run": 101106,
+ "sampler": "const",
+ "segment": 0,
+ "short": "MDC_PG_elec_200GeV",
+ "zpos": -1000.0
+}
diff --git a/Control/CalypsoExample/Generation/data/mdc/FaserMC-MDC_PG_elec_50GeV-101105.json b/Control/CalypsoExample/Generation/data/mdc/FaserMC-MDC_PG_elec_50GeV-101105.json
new file mode 100644
index 00000000..794c51fc
--- /dev/null
+++ b/Control/CalypsoExample/Generation/data/mdc/FaserMC-MDC_PG_elec_50GeV-101105.json
@@ -0,0 +1,13 @@
+{
+ "file_length": 1000,
+ "mass": 0.511,
+ "maxE": 50.0,
+ "minE": 50.0,
+ "pid": [-11, 11],
+ "radius": -100.0,
+ "run": 101105,
+ "sampler": "const",
+ "segment": 0,
+ "short": "MDC_PG_elec_50GeV",
+ "zpos": -1000.0
+}
diff --git a/Control/CalypsoExample/Generation/data/mdc/FaserMC-MDC_PG_muon_100GeV-101304.json b/Control/CalypsoExample/Generation/data/mdc/FaserMC-MDC_PG_muon_100GeV-101304.json
new file mode 100644
index 00000000..8d1a59c3
--- /dev/null
+++ b/Control/CalypsoExample/Generation/data/mdc/FaserMC-MDC_PG_muon_100GeV-101304.json
@@ -0,0 +1,14 @@
+{
+ "file_length": 2000,
+ "mass": 105.66,
+ "maxE": 100.0,
+ "minE": 100.0,
+ "pid": [-13, 13],
+ "radius": -20.0,
+ "angle": 0.001,
+ "run": 101304,
+ "sampler": "const",
+ "segment": 0,
+ "short": "MDC_PG_muon_100GeV",
+ "zpos": -1000.0
+}
diff --git a/Control/CalypsoExample/Generation/python/faserMDC_parser.py b/Control/CalypsoExample/Generation/python/faserMDC_parser.py
index 583b0419..575a2e2a 100644
--- a/Control/CalypsoExample/Generation/python/faserMDC_parser.py
+++ b/Control/CalypsoExample/Generation/python/faserMDC_parser.py
@@ -32,7 +32,7 @@ def faserMDC_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.015, type=float,
+ parser.add_argument("--angle", default=0.005, type=float,
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)")
diff --git a/Control/CalypsoExample/Generation/scripts/faserMDC_particlegun.py b/Control/CalypsoExample/Generation/scripts/faserMDC_particlegun.py
index 20970fdf..12fe153b 100755
--- a/Control/CalypsoExample/Generation/scripts/faserMDC_particlegun.py
+++ b/Control/CalypsoExample/Generation/scripts/faserMDC_particlegun.py
@@ -50,7 +50,7 @@ if __name__ == '__main__':
#
# All these must be specified to avoid auto-configuration
#
- ConfigFlags.Input.RunNumber = [args.run] #Isn't updating - todo: investigate
+ ConfigFlags.Input.RunNumber = [args.run]
ConfigFlags.Input.OverrideRunNumber = True
ConfigFlags.Input.LumiBlockNumber = [(args.segment+1)]
ConfigFlags.Input.isMC = True
--
GitLab