From c1ce2b9d4cd75101c46277839aaf53d6179c1381 Mon Sep 17 00:00:00 2001
From: Mohamed Amr Essam Saadawy <msaadawy@lxplus905.cern.ch>
Date: Wed, 19 Mar 2025 12:07:59 +0100
Subject: [PATCH 1/8] Add Calo_Only.json config for L0 trigger/GEP-like ntuples
---
configs/Calo_Only.json | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
create mode 100644 configs/Calo_Only.json
diff --git a/configs/Calo_Only.json b/configs/Calo_Only.json
new file mode 100644
index 000000000..2b7e3e8b8
--- /dev/null
+++ b/configs/Calo_Only.json
@@ -0,0 +1,34 @@
+{
+ "dumper": {
+ "jet_collection": "AntiKt4EMTopo422Jets",
+ "calibration": {},
+ "selection": {
+ "minimum_jet_pt": 20000,
+ "maximum_jet_absolute_eta": 2.5
+ },
+ "tracks": [],
+ "variables": {
+ "jet": {
+ "ints": ["HadronConeExclTruthLabelID"],
+ "floats": ["energy", "eta", "phi"]
+ },
+ "btagging": {},
+ "default_mapping": {},
+ "event": {
+ "customs": ["eventNumber"]
+ }
+ },
+ "flow": [
+ {
+ "type": "calocluster",
+ "output_name": "constituents",
+ "n_to_save": 20,
+ "accessor": "constituentLinks",
+ "variables": {
+ "customs": ["energy", "eta", "phi"]
+ }
+ }
+ ]
+ }
+ }
+
\ No newline at end of file
--
GitLab
From 4fb33391939ef7fd5572a575020f8dde55be7685 Mon Sep 17 00:00:00 2001
From: Mohamed Amr Essam Saadawy <mo.saadawy@cern.ch>
Date: Wed, 19 Mar 2025 11:41:37 +0000
Subject: [PATCH 2/8] calo_only
---
configs/{Calo_Only.json => calo_only.json} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename configs/{Calo_Only.json => calo_only.json} (100%)
diff --git a/configs/Calo_Only.json b/configs/calo_only.json
similarity index 100%
rename from configs/Calo_Only.json
rename to configs/calo_only.json
--
GitLab
From 77f95247b2cafe0e79266c1fe4a7e3793573a4a6 Mon Sep 17 00:00:00 2001
From: Mohamed Amr Essam Saadawy <mo.saadawy@cern.ch>
Date: Wed, 19 Mar 2025 11:54:44 +0000
Subject: [PATCH 3/8] config for studies that only use calorimeter variables
(e.g. L0-trigger jet studies)
---
configs/{calo_only.json => calorimeter_only.json} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename configs/{calo_only.json => calorimeter_only.json} (100%)
diff --git a/configs/calo_only.json b/configs/calorimeter_only.json
similarity index 100%
rename from configs/calo_only.json
rename to configs/calorimeter_only.json
--
GitLab
From 5957e967898fd68f0ce5c60ddc38169380e95c7b Mon Sep 17 00:00:00 2001
From: Mohamed Amr Essam Saadawy <msaadawy@lxplus905.cern.ch>
Date: Wed, 19 Mar 2025 13:41:18 +0100
Subject: [PATCH 4/8] config for studies that only use calorimeter variables
(e.g. L0-trigger jet studies)
---
FTagDumper/test/test-dumper | 2 ++
configs/calorimeter_only.json | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/FTagDumper/test/test-dumper b/FTagDumper/test/test-dumper
index b831df613..484593061 100755
--- a/FTagDumper/test/test-dumper
+++ b/FTagDumper/test/test-dumper
@@ -48,6 +48,7 @@ declare -A CONFIGS=(
[multi]=${CFG_DIR}/multi.json
[calo]=${CFG_DIR}/EMTopo_Caloclusters.json
[calo-hits]=${CFG_DIR}/EMTopo_CaloclustersHits.json
+ [calo_only]=${CFG_DIR}/calorimeter_only.json
[trigger-trackjet]=${CFG_DIR}/TriggerTrackJets.json
[trigger-fatjet]=${CFG_DIR}/TriggerFatJets.json
[trigger-hits]=${CFG_DIR}/trigger_hits.json
@@ -117,6 +118,7 @@ declare -A DATAFILES=(
[multi]=${OFFLINE_FTAG1}
[calo]=r14622/AOD.601229.e8514_s4162_r14622.small.pool.root
[calo-hits]=${TRIGGER_AOD}
+ [calorimeter_only]=r14622/AOD.601229.e8514_s4162_r14622.small.pool.root
[trigger-trackjet]=${TRIGGER_MC21_AOD}
[trigger-fatjet]=r16269/AOD.802423.e8514_e8586_s4369_s4370_r16269.small.pool.root
[trigger-hits]=${TRIGGER_AOD}
diff --git a/configs/calorimeter_only.json b/configs/calorimeter_only.json
index 2b7e3e8b8..a8e2d5d5a 100644
--- a/configs/calorimeter_only.json
+++ b/configs/calorimeter_only.json
@@ -1,6 +1,6 @@
{
"dumper": {
- "jet_collection": "AntiKt4EMTopo422Jets",
+ "jet_collection": "AntiKt4EMTopoJets",
"calibration": {},
"selection": {
"minimum_jet_pt": 20000,
--
GitLab
From cacfff7a34d83ef97dff10483ace7ea1f1dac81d Mon Sep 17 00:00:00 2001
From: Mohamed Amr Essam Saadawy <mo.saadawy@cern.ch>
Date: Thu, 20 Mar 2025 14:03:55 +0000
Subject: [PATCH 5/8] added config for studies that only use calorimeter
variables (e.g. L0-trigger jet studies), and adjusted test-dumper.
---
FTagDumper/test/test-dumper | 1 +
1 file changed, 1 insertion(+)
diff --git a/FTagDumper/test/test-dumper b/FTagDumper/test/test-dumper
index 484593061..978a93172 100755
--- a/FTagDumper/test/test-dumper
+++ b/FTagDumper/test/test-dumper
@@ -176,6 +176,7 @@ declare -A TESTS=(
[multi]=dump-multi-config
[calo]=dump-single-btag
[calo-hits]=dump-single-btag
+ [calorimeter_only]=dump-single-btag
[trigger-trackjet]=dump-trigger-trackjet
[trigger-fatjet]=dump-trigger-fatjet
[trigger-hits]=dump-trigger-all
--
GitLab
From 671f267a94d1555ec8391bf03554c81a9f16ed3b Mon Sep 17 00:00:00 2001
From: Mohamed Amr Essam Saadawy <mo.saadawy@cern.ch>
Date: Thu, 20 Mar 2025 15:16:07 +0000
Subject: [PATCH 6/8] edit test-dumper for the addition of calorimeter_only
config
---
FTagDumper/test/test-dumper | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/FTagDumper/test/test-dumper b/FTagDumper/test/test-dumper
index 978a93172..de4fd77f3 100755
--- a/FTagDumper/test/test-dumper
+++ b/FTagDumper/test/test-dumper
@@ -48,7 +48,7 @@ declare -A CONFIGS=(
[multi]=${CFG_DIR}/multi.json
[calo]=${CFG_DIR}/EMTopo_Caloclusters.json
[calo-hits]=${CFG_DIR}/EMTopo_CaloclustersHits.json
- [calo_only]=${CFG_DIR}/calorimeter_only.json
+ [calorimeter-only]=${CFG_DIR}/calorimeter_only.json
[trigger-trackjet]=${CFG_DIR}/TriggerTrackJets.json
[trigger-fatjet]=${CFG_DIR}/TriggerFatJets.json
[trigger-hits]=${CFG_DIR}/trigger_hits.json
@@ -118,7 +118,7 @@ declare -A DATAFILES=(
[multi]=${OFFLINE_FTAG1}
[calo]=r14622/AOD.601229.e8514_s4162_r14622.small.pool.root
[calo-hits]=${TRIGGER_AOD}
- [calorimeter_only]=r14622/AOD.601229.e8514_s4162_r14622.small.pool.root
+ [calorimeter-only]=r14622/AOD.601229.e8514_s4162_r14622.small.pool.root
[trigger-trackjet]=${TRIGGER_MC21_AOD}
[trigger-fatjet]=r16269/AOD.802423.e8514_e8586_s4369_s4370_r16269.small.pool.root
[trigger-hits]=${TRIGGER_AOD}
--
GitLab
From 258523dd272a7e061f0f4e44355646e6497e138d Mon Sep 17 00:00:00 2001
From: Mohamed Amr Essam Saadawy <mo.saadawy@cern.ch>
Date: Thu, 20 Mar 2025 15:16:46 +0000
Subject: [PATCH 7/8] Edit .gitlab-ci.yml for the addition of calorimeter_only
config file
---
.gitlab-ci.yml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2391e0ca2..c00da7905 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -260,6 +260,11 @@ test_calo:
script:
- test-dumper calo
+test_calorimeter_only:
+ <<: *run-athanalysis
+ script:
+ - test-dumper calorimeter-only
+
test_calo_hits:
<<: *run-athanalysis
script:
--
GitLab
From 4efe58cb42b5942e99c1be16c0e8fa137780ca66 Mon Sep 17 00:00:00 2001
From: Mohamed Amr Essam Saadawy <mo.saadawy@cern.ch>
Date: Thu, 20 Mar 2025 15:29:12 +0000
Subject: [PATCH 8/8] Edit test-dumper for the addition of calorimeter_only
config file.
---
FTagDumper/test/test-dumper | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/FTagDumper/test/test-dumper b/FTagDumper/test/test-dumper
index de4fd77f3..fab1b3f89 100755
--- a/FTagDumper/test/test-dumper
+++ b/FTagDumper/test/test-dumper
@@ -176,7 +176,7 @@ declare -A TESTS=(
[multi]=dump-multi-config
[calo]=dump-single-btag
[calo-hits]=dump-single-btag
- [calorimeter_only]=dump-single-btag
+ [calorimeter-only]=dump-single-btag
[trigger-trackjet]=dump-trigger-trackjet
[trigger-fatjet]=dump-trigger-fatjet
[trigger-hits]=dump-trigger-all
--
GitLab