From 1e8eb2886eb87193f9769fd99c87fe65c42f9a28 Mon Sep 17 00:00:00 2001 From: John Chapman Date: Fri, 1 Nov 2019 13:21:33 +0100 Subject: [PATCH] Protect against using CommonGeometryFlags and MuonGeometryFlags if globalflags.DetDescrVersion has not been configured --- .../share/skeleton.OverlayPool_tf.py | 22 ++++++++--------- .../share/skeleton.Overlay_tf.py | 24 ++++++++++--------- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.OverlayPool_tf.py b/Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.OverlayPool_tf.py index 38228f4f5a1..13c6f4f9533 100644 --- a/Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.OverlayPool_tf.py +++ b/Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.OverlayPool_tf.py @@ -82,17 +82,17 @@ else: DetFlags.digitize.LVL1_setOff() -## Tidy up NSW DetFlags: temporary measure -DetFlags.sTGC_setOff() -DetFlags.Micromegas_setOff() -from AtlasGeoModel.CommonGMJobProperties import CommonGeometryFlags -if (CommonGeometryFlags.Run() in ["RUN3", "RUN4"]): - DetFlags.sTGC_setOn() - DetFlags.Micromegas_setOn() - -from AtlasGeoModel.MuonGMJobProperties import MuonGeometryFlags -if not MuonGeometryFlags.hasCSC(): - DetFlags.CSC_setOff() +if hasattr(runArgs,"geometryVersion") or not globalflags.DetDescrVersion.isDefault(): + ## Tidy up NSW DetFlags + ## only do this if we can be sure globalflags.DetDescrVersion has been configured. + from AtlasGeoModel.CommonGMJobProperties import CommonGeometryFlags + if CommonGeometryFlags.Run() not in ["RUN3", "RUN4"]: + DetFlags.sTGC_setOff() + DetFlags.Micromegas_setOff() + + from AtlasGeoModel.MuonGMJobProperties import MuonGeometryFlags + if not MuonGeometryFlags.hasCSC(): + DetFlags.CSC_setOff() DetFlags.Print() diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.Overlay_tf.py b/Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.Overlay_tf.py index 81ba3e27855..51bfac1f376 100644 --- a/Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.Overlay_tf.py +++ b/Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.Overlay_tf.py @@ -109,17 +109,19 @@ else: DetFlags.digitize.LVL1_setOff() -## Tidy up NSW DetFlags: temporary measure -DetFlags.sTGC_setOff() -DetFlags.Micromegas_setOff() -from AtlasGeoModel.CommonGMJobProperties import CommonGeometryFlags -if (CommonGeometryFlags.Run() in ["RUN3", "RUN4"]): - DetFlags.sTGC_setOn() - DetFlags.Micromegas_setOn() - -from AtlasGeoModel.MuonGMJobProperties import MuonGeometryFlags -if not MuonGeometryFlags.hasCSC(): - DetFlags.CSC_setOff() +if hasattr(runArgs,"geometryVersion") or not globalflags.DetDescrVersion.isDefault(): + ## Tidy up NSW DetFlags: temporary measure + ## only do this if we can be sure globalflags.DetDescrVersion has been configured. + DetFlags.sTGC_setOff() + DetFlags.Micromegas_setOff() + from AtlasGeoModel.CommonGMJobProperties import CommonGeometryFlags + if (CommonGeometryFlags.Run() in ["RUN3", "RUN4"]): + DetFlags.sTGC_setOn() + DetFlags.Micromegas_setOn() + + from AtlasGeoModel.MuonGMJobProperties import MuonGeometryFlags + if not MuonGeometryFlags.hasCSC(): + DetFlags.CSC_setOff() # TODO: need to do it better #DetFlags.makeRIO.all_setOff() ## Currently has to be on otherwise InDetTRTStrawStatusSummarySvc is not created -- GitLab