From 4a73efc0e89bebd32127f5aead7b937f1591d4d8 Mon Sep 17 00:00:00 2001
From: FASER Reco <faserrec@lxplus702.cern.ch>
Date: Wed, 3 Jan 2024 19:01:55 +0100
Subject: [PATCH] Fixes to finish 2023 reprocessing
---
LHCData/LHCDataAlgs/src/LHCDataAlg.cxx | 14 +++++++++-----
.../scripts/submit_faser_ntuple_maker.sh | 6 +++++-
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/LHCData/LHCDataAlgs/src/LHCDataAlg.cxx b/LHCData/LHCDataAlgs/src/LHCDataAlg.cxx
index 13229039..1c0e4992 100644
--- a/LHCData/LHCDataAlgs/src/LHCDataAlg.cxx
+++ b/LHCData/LHCDataAlgs/src/LHCDataAlg.cxx
@@ -176,17 +176,21 @@ LHCDataAlg::findNearest(unsigned int bcid, const std::vector<unsigned char>& bci
}
// If we got to here, there was no match
+ // This is possible if for instance all BCIDs are colliding and mask = 0x01
+
// Does the BCID make sense?
ATH_MSG_WARNING("Couldn't find distance from BCID " << bcid << " and pattern " << int(mask) << "!");
+
+ // Only print this out in debug, otherwise floods log file
int b1=0;
int b2=0;
int col = 0;
for (int i=0; i<3564; i++) {
- if (mask & 0x01) b1++;
- if (mask & 0x02) b2++;
- if (mask & 0x03) col++;
-
- ATH_MSG_WARNING("BCID " << i << " - " << int(bcid_mask[i]));
+ if (bcid_mask[i] & 0x01) b1++;
+ if (bcid_mask[i] & 0x02) b2++;
+ if (bcid_mask[i] & 0x03) col++;
+ if (bcid_mask[i] > 0)
+ ATH_MSG_DEBUG("BCID " << i << " - " << int(bcid_mask[i]));
}
//ATH_MSG_WARNING(bcid_mask);
diff --git a/PhysicsAnalysis/NtupleDumper/scripts/submit_faser_ntuple_maker.sh b/PhysicsAnalysis/NtupleDumper/scripts/submit_faser_ntuple_maker.sh
index 70b2f7cb..7746c642 100755
--- a/PhysicsAnalysis/NtupleDumper/scripts/submit_faser_ntuple_maker.sh
+++ b/PhysicsAnalysis/NtupleDumper/scripts/submit_faser_ntuple_maker.sh
@@ -269,7 +269,11 @@ export EOS_MGM_URL=root://eospublic.cern.ch
#
# Run job
#
-faser_ntuple_maker.py $last_file_str $partialstr $tagstr $ismc --slice $slice --files $nfiles $mergestr $dir_path "$@"
+echo
+echo "Submit job:"
+echo faser_ntuple_maker.py $last_file_str $partialstr $tagstr $ismc --slice $slice --files $nfiles $mergestr "$@" $dir_path
+echo
+faser_ntuple_maker.py $last_file_str $partialstr $tagstr $ismc --slice $slice --files $nfiles $mergestr "$@" $dir_path
ntup_code=$?
echo "Return code: $ntup_code"
#
--
GitLab