From 453b9411bbcf15d19b941aab562ad6b09f1c32e3 Mon Sep 17 00:00:00 2001
From: Tamara Vazquez Schroeder <tamara.vazquez.schroeder@cern.ch>
Date: Tue, 14 Nov 2017 15:43:50 +0000
Subject: [PATCH] Merge branch 'cherry-pick-2feee641' into '21.0'
Merge branch 'master-ATLASRECTS-4156' into 'master'
See merge request !6410
(cherry picked from commit 1dffc7608d14909398615e1d3d0f84cdfec64d47 [formerly 035505f9f8f95677836427c3db29b395275bc42f])
2dcf6ba9 Merge branch 'master-ATLASRECTS-4156' into 'master'
Former-commit-id: 277bac1a4a57d35b640d1307ca23ffdf3134310a
---
.../MuonDQA/MuonTrkPhysMonitoring/Makefile | 0
.../MuonTrkPhysMonitoring/Makefile | 0
.../AnalysisCommon/ReweightUtils/cmt/Makefile | 0
Tools/PyUtils/bin/dump-athfile.py | 34 ++++++++++---------
.../cmt/fragments/l1topo_pygen | 0
5 files changed, 18 insertions(+), 16 deletions(-)
mode change 100644 => 100755 MuonSpectrometer/MuonValidation/MuonDQA/MuonTrkPhysMonitoring/Makefile
mode change 100644 => 100755 MuonSpectrometer/MuonValidation/MuonDQA/MuonTrkPhysMonitoring/MuonTrkPhysMonitoring/Makefile
mode change 100644 => 100755 PhysicsAnalysis/AnalysisCommon/ReweightUtils/cmt/Makefile
mode change 100644 => 100755 Trigger/TrigT1/L1Topo/L1TopoAlgorithms/cmt/fragments/l1topo_pygen
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrkPhysMonitoring/Makefile b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrkPhysMonitoring/Makefile
old mode 100644
new mode 100755
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrkPhysMonitoring/MuonTrkPhysMonitoring/Makefile b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrkPhysMonitoring/MuonTrkPhysMonitoring/Makefile
old mode 100644
new mode 100755
diff --git a/PhysicsAnalysis/AnalysisCommon/ReweightUtils/cmt/Makefile b/PhysicsAnalysis/AnalysisCommon/ReweightUtils/cmt/Makefile
old mode 100644
new mode 100755
diff --git a/Tools/PyUtils/bin/dump-athfile.py b/Tools/PyUtils/bin/dump-athfile.py
index 348ee0fb47e..23423684cbb 100755
--- a/Tools/PyUtils/bin/dump-athfile.py
+++ b/Tools/PyUtils/bin/dump-athfile.py
@@ -125,22 +125,24 @@ if __name__ == "__main__":
print fmt % ('conditions tag', f.infos['conditions_tag'])
_metadata = f.infos['metadata']
- # ATEAM-162: determine if this is 25ns or 50ns sub-campaign
- DigitizationParameters = _metadata['/Digitization/Parameters'] if '/Digitization/Parameters' in _metadata.keys() else {}
- if 'bunchSpacing' in DigitizationParameters.keys() and 'BeamIntensityPattern' in DigitizationParameters.keys() :
- bunchSlotLength = DigitizationParameters['bunchSpacing']
- pattern = DigitizationParameters['BeamIntensityPattern']
- firstBunch = pattern.index(1.0)
- bunchCountInTwoFirstSlots = pattern[firstBunch:firstBunch+2].count(1.0)
- if bunchCountInTwoFirstSlots == 1:
- campaign = '50 ns'
- elif bunchCountInTwoFirstSlots == 2:
- campaign = '25 ns'
- else:
- campaign = None
- print fmt % ('bunch spacing', campaign + ' i.e. ..., ' + str(pattern[firstBunch:firstBunch+4])[1:-1] + ', ...')
-
- _metadata = _metadata.keys() if isinstance(_metadata,dict) else None
+ if _metadata is not None:
+ # ATEAM-162: determine if this is 25ns or 50ns sub-campaign
+ DigitizationParameters = _metadata['/Digitization/Parameters'] if '/Digitization/Parameters' in _metadata.keys() else {}
+ if DigitizationParameters is not None and 'bunchSpacing' in DigitizationParameters.keys() and 'BeamIntensityPattern' in DigitizationParameters.keys() :
+ bunchSlotLength = DigitizationParameters['bunchSpacing']
+ pattern = DigitizationParameters['BeamIntensityPattern']
+ if pattern is not None:
+ firstBunch = pattern.index(1.0)
+ bunchCountInTwoFirstSlots = pattern[firstBunch:firstBunch+2].count(1.0)
+ if bunchCountInTwoFirstSlots == 1:
+ campaign = '50 ns'
+ elif bunchCountInTwoFirstSlots == 2:
+ campaign = '25 ns'
+ else:
+ campaign = None
+ print fmt % ('bunch spacing', campaign + ' i.e. ..., ' + str(pattern[firstBunch:firstBunch+4])[1:-1] + ', ...')
+
+ _metadata = _metadata.keys() if isinstance(_metadata,dict) else None
print fmt % ('meta data', _metadata)
msg.info(':'*80)
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/cmt/fragments/l1topo_pygen b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/cmt/fragments/l1topo_pygen
old mode 100644
new mode 100755
--
GitLab