Merge branch 'cherry-pick-2feee641' into '21.0'

Merge branch 'master-ATLASRECTS-4156' into 'master'

See merge request !6410

(cherry picked from commit 1dffc760 [formerly 035505f9f8f95677836427c3db29b395275bc42f])

2dcf6ba9 Merge branch 'master-ATLASRECTS-4156' into 'master'

Former-commit-id: 277bac1a4a57d35b640d1307ca23ffdf3134310a

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)