From b38cb81c1624812b801e759c9a2f95dbea483d4c Mon Sep 17 00:00:00 2001
From: FaserMC <fasermc@cern.ch>
Date: Sat, 21 Jan 2023 22:14:32 +0100
Subject: [PATCH] Patches to reco scripts for r0012
---
.../CalypsoExample/Digitization/scripts/faser_digi_merge.py | 2 +-
.../Reconstruction/scripts/submit_faser_reco.sh | 4 ++--
PhysicsAnalysis/NtupleDumper/scripts/faser_ntuple_maker.py | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Control/CalypsoExample/Digitization/scripts/faser_digi_merge.py b/Control/CalypsoExample/Digitization/scripts/faser_digi_merge.py
index 2854fd99..a99c51ee 100755
--- a/Control/CalypsoExample/Digitization/scripts/faser_digi_merge.py
+++ b/Control/CalypsoExample/Digitization/scripts/faser_digi_merge.py
@@ -131,7 +131,7 @@ if len(args.short) > 0:
# more files later. --complete overrides this if wanted
# Build output filename
-if seglo == 0 and (seghi+1) == len(dirlist) and args.complete: # Full run
+if args.complete and (seglo == 0) and ((seghi+1) == len(dirlist)): # Full run
outfile = f"FaserMC-{short}-{run}"
elif seglo == seghi: # Single segment
outfile = f"FaserMC-{short}-{run}-{seglo:05}"
diff --git a/Control/CalypsoExample/Reconstruction/scripts/submit_faser_reco.sh b/Control/CalypsoExample/Reconstruction/scripts/submit_faser_reco.sh
index 5f1ee066..f75b144a 100755
--- a/Control/CalypsoExample/Reconstruction/scripts/submit_faser_reco.sh
+++ b/Control/CalypsoExample/Reconstruction/scripts/submit_faser_reco.sh
@@ -11,7 +11,7 @@
#
# Monte Carlo options:
# --isMC - needed for MC reco
-# --digiTag <tag> - override MC reco tag for calo gain (matches digi tag)
+# --caloTag <tag> - override MC reco tag for calo gain (to match digi tag)
#
# file_path - full file name (with path)
# release_directory - optional path to release install directory (default pwd)
@@ -55,7 +55,7 @@ do
ismc=1
shift;;
- --digiTag)
+ --caloTag)
echo "Override calo digi tag with $2"
gainstr="--MC_calibTag $2"
shift;
diff --git a/PhysicsAnalysis/NtupleDumper/scripts/faser_ntuple_maker.py b/PhysicsAnalysis/NtupleDumper/scripts/faser_ntuple_maker.py
index 5ae87306..189b9500 100755
--- a/PhysicsAnalysis/NtupleDumper/scripts/faser_ntuple_maker.py
+++ b/PhysicsAnalysis/NtupleDumper/scripts/faser_ntuple_maker.py
@@ -92,7 +92,7 @@ if filepath.is_dir():
for seg in seglist:
if args.isMC:
- searchstr = f"FaserMC-*-{runstr}-{seg}-*xAOD.root"
+ searchstr = f"FaserMC-*-{seg}-*xAOD.root"
else:
searchstr = f"Faser-Physics-{runstr}-{seg}-*xAOD.root"
--
GitLab