From d004f1760f500617c79455fcbe2d016f294c545c Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <fwinkl@cern>
Date: Thu, 3 Dec 2020 15:20:13 +0100
Subject: [PATCH 1/4] MuonCombinedTimingTools: cmake and flake8 fixes
---
.../MuonCombinedTimingTools/CMakeLists.txt | 12 +++---------
.../python/MuonCombinedTimingConfig.py | 5 +----
2 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/Reconstruction/MuonIdentification/MuonCombinedTimingTools/CMakeLists.txt b/Reconstruction/MuonIdentification/MuonCombinedTimingTools/CMakeLists.txt
index a6231f3893b1..c185c0228d43 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedTimingTools/CMakeLists.txt
+++ b/Reconstruction/MuonIdentification/MuonCombinedTimingTools/CMakeLists.txt
@@ -1,20 +1,14 @@
-################################################################################
-# Package: MuonCombinedTimingTools
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( MuonCombinedTimingTools )
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
# Component(s) in the package:
atlas_add_component( MuonCombinedTimingTools
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps xAODMuon GaudiKernel MuonCombinedToolInterfaces TrkSegment TrkSpaceTimePoint TrkToolInterfaces )
+ LINK_LIBRARIES AthenaBaseComps xAODMuon GaudiKernel MuonCombinedToolInterfaces TrkSegment TrkSpaceTimePoint TrkToolInterfaces )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Reconstruction/MuonIdentification/MuonCombinedTimingTools/python/MuonCombinedTimingConfig.py b/Reconstruction/MuonIdentification/MuonCombinedTimingTools/python/MuonCombinedTimingConfig.py
index aac39a182c80..abc96e804baf 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedTimingTools/python/MuonCombinedTimingConfig.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedTimingTools/python/MuonCombinedTimingConfig.py
@@ -1,11 +1,8 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
########################## start of MuonTiming Filter Fragment ##################################
from AthenaCommon.AppMgr import ToolSvc
-from AthenaCommon.AppMgr import ServiceMgr
-from AthenaCommon.DetFlags import DetFlags
import AthenaCommon.CfgMgr as CfgMgr
-from MuonCombinedRecExample.MuonCombinedRecFlags import muonCombinedRecFlags
from AthenaCommon.Include import include
include( "TrackInCaloTools/TrackInCaloTools_jobOptions.py" )
#from TrackInCaloTools import TrackInCaloTools_jobOptions
--
GitLab
From e6237070bcd75498c5e0fb5f670f35e06bebc9cf Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <fwinkl@cern>
Date: Thu, 3 Dec 2020 15:20:49 +0100
Subject: [PATCH 2/4] MuonCombinedAlgs: cmake and flake8 fixes
---
.../MuonIdentification/MuonCombinedAlgs/CMakeLists.txt | 8 +++-----
.../MuonCombinedAlgs/python/MuonCombinedAlgsMonitoring.py | 1 +
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/Reconstruction/MuonIdentification/MuonCombinedAlgs/CMakeLists.txt b/Reconstruction/MuonIdentification/MuonCombinedAlgs/CMakeLists.txt
index 4de1ad8ab9c5..38cdd9f98f66 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedAlgs/CMakeLists.txt
+++ b/Reconstruction/MuonIdentification/MuonCombinedAlgs/CMakeLists.txt
@@ -1,6 +1,4 @@
-################################################################################
-# Package: MuonCombinedAlgs
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( MuonCombinedAlgs )
@@ -9,6 +7,6 @@ atlas_subdir( MuonCombinedAlgs )
atlas_add_component( MuonCombinedAlgs
src/*.cxx
src/components/*.cxx
- LINK_LIBRARIES AthenaBaseComps AthenaMonitoringKernelLib xAODCaloEvent xAODMuon xAODTruth xAODTracking GaudiKernel MuonSegment MuonRecToolInterfaces MuonLayerEvent MuonCombinedEvent MuonCombinedToolInterfaces TrkSegment TrkTrack TrkToolInterfaces)
+ LINK_LIBRARIES AthenaBaseComps AthenaMonitoringKernelLib xAODCaloEvent xAODMuon xAODTruth xAODTracking GaudiKernel MuonSegment MuonRecToolInterfaces MuonLayerEvent MuonCombinedEvent MuonCombinedToolInterfaces MuonPrepRawData StoreGateLib TrkSegment TrkTrack TrkToolInterfaces)
-atlas_install_python_modules( python/MuonCombinedAlgsMonitoring.py)
+atlas_install_python_modules( python/MuonCombinedAlgsMonitoring.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Reconstruction/MuonIdentification/MuonCombinedAlgs/python/MuonCombinedAlgsMonitoring.py b/Reconstruction/MuonIdentification/MuonCombinedAlgs/python/MuonCombinedAlgsMonitoring.py
index 0bd1261b841d..44151e83ee65 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedAlgs/python/MuonCombinedAlgsMonitoring.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedAlgs/python/MuonCombinedAlgsMonitoring.py
@@ -1,3 +1,4 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Author: Laurynas Mince
# Created on 26.07.2019
--
GitLab
From f0874163a405477ca86ec55778932c766d89c990 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <fwinkl@cern>
Date: Fri, 4 Dec 2020 10:09:16 +0100
Subject: [PATCH 3/4] MuonCombinedRecExample: enable flake8 and fix code
---
.../MuonCombinedRecExample/CMakeLists.txt | 6 ++--
.../python/CombinedMuonTrackSummary.py | 2 --
.../python/MuGirlTagTool.py | 9 ++---
.../python/MuonCaloTagTool.py | 4 +--
.../python/MuonCombinedAlgs.py | 7 ++--
.../python/MuonCombinedCalibConfig.py | 35 +++++++++----------
.../python/MuonCombinedFitTools.py | 22 +++++-------
.../python/MuonCombinedRecExampleConfigDb.py | 7 +---
.../python/MuonCombinedRecFlags.py | 25 ++++---------
.../python/MuonCombinedRecOnlySetup.py | 6 ++--
.../python/MuonCombinedTools.py | 19 ++++------
.../python/MuonSegmentTaggerTools.py | 13 ++-----
.../python/ScaleCalibrationInputSetup.py | 9 ++---
.../python/TagAndProbeInputSetup.py | 4 +--
14 files changed, 59 insertions(+), 109 deletions(-)
diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/CMakeLists.txt b/Reconstruction/MuonIdentification/MuonCombinedRecExample/CMakeLists.txt
index 821537cb7e16..28f5524d9b57 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/CMakeLists.txt
+++ b/Reconstruction/MuonIdentification/MuonCombinedRecExample/CMakeLists.txt
@@ -1,11 +1,9 @@
-################################################################################
-# Package: MuonCombinedRecExample
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( MuonCombinedRecExample )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_joboptions( share/*.py )
diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/CombinedMuonTrackSummary.py b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/CombinedMuonTrackSummary.py
index 89e0c5caf066..d52f506bae4f 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/CombinedMuonTrackSummary.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/CombinedMuonTrackSummary.py
@@ -8,12 +8,10 @@
#==========================================================================
from AthenaCommon.DetFlags import DetFlags
-from AthenaCommon.AppMgr import ServiceMgr
from AthenaCommon.AppMgr import ToolSvc
from AthenaCommon.BeamFlags import jobproperties
from MuonCombinedRecExample.MuonCombinedRecFlags import muonCombinedRecFlags
from AthenaCommon.CfgGetter import getPublicTool
-from AthenaCommon.GlobalFlags import globalflags
beamFlags = jobproperties.Beam
diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuGirlTagTool.py b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuGirlTagTool.py
index ff9f2002549c..a5f9d3ab16c7 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuGirlTagTool.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuGirlTagTool.py
@@ -3,7 +3,7 @@
### JobOptions to run MuGirlTag in xAOD
from AthenaCommon import CfgMgr
-from AthenaCommon.CfgGetter import getPublicTool,getPublicToolClone,getService
+from AthenaCommon.CfgGetter import getPublicTool
from AthenaCommon.GlobalFlags import globalflags
from RecExConfig.RecFlags import rec
@@ -14,9 +14,6 @@ from MuonCombinedRecExample.MuonCombinedRecFlags import muonCombinedRecFlags
from MuonRecExample.MooreTools import MuonSeededSegmentFinder, MuonChamberHoleRecoveryTool
from MuonRecExample.MuonRecTools import DCMathSegmentMaker
-###logfile
-from AthenaCommon.Logging import log
-
from AtlasGeoModel.MuonGMJobProperties import MuonGeometryFlags
from TriggerJobOpts.TriggerFlags import TriggerFlags
from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
@@ -24,7 +21,7 @@ from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
def MuonInsideOutRecoTool( name="MuonInsideOutRecoTool", **kwargs ):
if TriggerFlags.MuonSlice.doTrigMuonConfig:
kwargs.setdefault("VertexContainer", "")
- import MuonCombinedRecExample.CombinedMuonTrackSummary
+ import MuonCombinedRecExample.CombinedMuonTrackSummary # noqa: F401 (import side-effects)
from AthenaCommon.AppMgr import ToolSvc
kwargs.setdefault("TrackSummaryTool", ToolSvc.CombinedMuonTrackSummary)
kwargs.setdefault("MuonLayerSegmentFinderTool", getPublicTool("MuonLayerSegmentFinderTool"))
@@ -91,7 +88,7 @@ def MuonStauInsideOutRecoTool( name="MuonStauInsideOutRecoTool", **kwargs ):
kwargs.setdefault("MuonCandidateTrackBuilderTool", getPublicTool("MuonStauCandidateTrackBuilderTool") )
if TriggerFlags.MuonSlice.doTrigMuonConfig:
kwargs.setdefault("VertexContainer", "")
- import MuonCombinedRecExample.CombinedMuonTrackSummary
+ import MuonCombinedRecExample.CombinedMuonTrackSummary # noqa: F401 (import side-effects)
from AthenaCommon.AppMgr import ToolSvc
kwargs.setdefault("TrackSummaryTool", ToolSvc.CombinedMuonTrackSummary)
return CfgMgr.MuonCombined__MuonInsideOutRecoTool(name,**kwargs )
diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCaloTagTool.py b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCaloTagTool.py
index 9300cd9534b7..af515db9baf9 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCaloTagTool.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCaloTagTool.py
@@ -1,9 +1,9 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
### JobOptions to run MuonCaloTag in xAOD
from AthenaCommon import CfgMgr
-from AthenaCommon.CfgGetter import getPublicTool,getService, getPrivateTool
+from AthenaCommon.CfgGetter import getPublicTool, getPrivateTool
###############################################################################
## Helper function for defining THistSvc inputs
diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedAlgs.py b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedAlgs.py
index 49515f05765b..2035e3bf58a6 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedAlgs.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedAlgs.py
@@ -1,14 +1,13 @@
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
from MuonCombinedRecExample.MuonCombinedRecFlags import muonCombinedRecFlags
-from AthenaCommon.CfgGetter import getPublicTool, getAlgorithm,getPublicToolClone
+from AthenaCommon.CfgGetter import getPublicTool, getAlgorithm
from MuonRecExample.ConfiguredMuonRec import ConfiguredMuonRec
from MuonRecExample.MuonRecFlags import muonRecFlags
muonRecFlags.setDefaults()
from AthenaCommon.AlgSequence import AlgSequence
from AthenaCommon import CfgMgr
-from AthenaCommon.BeamFlags import jobproperties
from AtlasGeoModel.MuonGMJobProperties import MuonGeometryFlags
from MuonCombinedRecExample.MuonCombinedKeys import MuonCombinedKeys as MuonCbKeys
@@ -19,7 +18,7 @@ from TriggerJobOpts.TriggerFlags import TriggerFlags
def MuonCombinedInDetExtensionAlg(name="MuonCombinedInDetExtensionAlg",**kwargs):
tools = []
if muonCombinedRecFlags.doCaloTrkMuId():
- tools.append(getTool("MuonCaloTagTool"))
+ tools.append(getPublicTool("MuonCaloTagTool"))
kwargs.setdefault("TagMap", "caloTagMap" )
kwargs.setdefault("MuonCombinedInDetExtensionTools", tools )
kwargs.setdefault("HasCSC", MuonGeometryFlags.hasCSC() )
@@ -159,7 +158,7 @@ def recordMuonCreatorAlgObjs (kw):
Alg = CfgMgr.MuonCreatorAlg
def val (prop):
d = kw.get (prop)
- if d == None:
+ if d is None:
d = Alg.__dict__[prop].default
return str(d)
objs = {'xAOD::MuonContainer': val('MuonContainerLocation'),
diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedCalibConfig.py b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedCalibConfig.py
index c89df613f4d2..3066b32d551e 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedCalibConfig.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedCalibConfig.py
@@ -1,40 +1,37 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-from AthenaCommon.JobProperties import JobProperty,JobPropertyContainer,jobproperties
from AthenaCommon.AppMgr import ToolSvc
from AthenaCommon.AlgSequence import AlgSequence
from AthenaCommon.Logging import logging
-from AthenaCommon import BeamFlags
-beamFlags = jobproperties.Beam
from MuonCombinedRecExample.MuonCombinedRecFlags import muonCombinedRecFlags
from MuonRecExample.MuonRecFlags import muonRecFlags
from MuonCnvExample.MuonCalibFlags import muonCalibFlags
from RecExConfig.RecFlags import rec
+log = logging.getLogger("MuonCombinedRec")
+
# configure calib algs for standalone
if muonRecFlags.doCalibNtuple():
- from MuonRecExample import MuonAlignConfig
+ from MuonRecExample import MuonAlignConfig # noqa: F401 (import side-effects)
from MuonCnvExample import setupMuonCalibNtuple
setupMuonCalibNtuple()
elif muonRecFlags.doCalib():
- from MuonRecExample import MuonAlignConfig
+ from MuonRecExample import MuonAlignConfig # noqa: F401 (import side-effects)
from MuonCnvExample import setupMuonCalib
setupMuonCalib()
else:
- logMuon.warning("Loading %s but not setting up any MuonCalibration or Ntuple" % __name__ )
+ log.warning("Loading %s but not setting up any MuonCalibration or Ntuple", __name__ )
# NB. call setDefaults *after* import MuonCalibConfig
muonCalibFlags.setDefaults()
-log = logging.getLogger("MuonCombinedRec")
-
topSequence = AlgSequence()
#
# Move MuonCalibExtraTree to end of topSequence and configure for combined
#s
-from PyUtils.MetaReaderPeeker import metadata, convert_itemList
+from PyUtils.MetaReaderPeeker import convert_itemList
def checkContainerInInputFile(container_type, container_name):
if container_type in convert_itemList(layout='dict'):
if container_name in convert_itemList(layout='dict')[container_type]:
@@ -43,19 +40,19 @@ def checkContainerInInputFile(container_type, container_name):
def StacoMuonCollectionAvailable():
- return False
+ return False
def MuidMuonCollectionAvailable():
- return False
+ return False
def MuonsMuonCollectionAvailable():
- if rec.readESD() and checkContainerInInputFile("Analysis::MuonContainer", "Muons"):
- return True
- if muonCombinedRecFlags.doxAOD() and muonCombinedRecFlags.doCombinedFit():
- return True
- if hasattr(topSequence, 'BuildMuonCollection'):
- return True
- return False
+ if rec.readESD() and checkContainerInInputFile("Analysis::MuonContainer", "Muons"):
+ return True
+ if muonCombinedRecFlags.doxAOD() and muonCombinedRecFlags.doCombinedFit():
+ return True
+ if hasattr(topSequence, 'BuildMuonCollection'):
+ return True
+ return False
try:
diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedFitTools.py b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedFitTools.py
index 2f628b59fadb..1cb5382fcf1a 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedFitTools.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedFitTools.py
@@ -11,13 +11,11 @@
#==============================================================
-from MuonCombinedRecExample.MuonCombinedRecFlags import muonCombinedRecFlags
-from MuonRecExample.MuonRecFlags import muonRecFlags,muonStandaloneFlags
+from MuonRecExample.MuonRecFlags import muonRecFlags
from MuonRecExample.MuonStandaloneFlags import muonStandaloneFlags
-from MuonRecExample.MuonRecUtils import ExtraFlags
from AthenaCommon import CfgMgr
-from AthenaCommon.CfgGetter import getPrivateTool,getPrivateToolClone,getPublicTool,getPublicToolClone,getService,getServiceClone
+from AthenaCommon.CfgGetter import getPrivateTool, getPrivateToolClone, getPublicTool, getPublicToolClone, getService
from AthenaCommon.BeamFlags import jobproperties
beamFlags = jobproperties.Beam
from AthenaCommon.DetFlags import DetFlags
@@ -25,7 +23,6 @@ from AthenaCommon.SystemOfUnits import meter
from IOVDbSvc.CondDB import conddb
from AthenaCommon.GlobalFlags import globalflags
-from RecExConfig.RecFlags import rec
from AtlasGeoModel.MuonGMJobProperties import MuonGeometryFlags
from TriggerJobOpts.TriggerFlags import TriggerFlags
@@ -50,7 +47,7 @@ def iPatFitter( name='iPatFitter', **kwargs):
if TriggerFlags.MuonSlice.doTrigMuonConfig:
kwargs.setdefault("MaxIterations", 15)
else:
- import MuonCombinedRecExample.CombinedMuonTrackSummary
+ import MuonCombinedRecExample.CombinedMuonTrackSummary # noqa: F401 (import side-effects)
from AthenaCommon.AppMgr import ToolSvc
kwargs.setdefault("TrackSummaryTool", ToolSvc.CombinedMuonTrackSummary)
@@ -65,7 +62,7 @@ def iPatSLFitter( name='iPatSLFitter', **kwargs):
if TriggerFlags.MuonSlice.doTrigMuonConfig:
kwargs.setdefault("MaxIterations", 15)
else:
- import MuonCombinedRecExample.CombinedMuonTrackSummary
+ import MuonCombinedRecExample.CombinedMuonTrackSummary # noqa: F401 (import side-effects)
from AthenaCommon.AppMgr import ToolSvc
kwargs.setdefault("TrackSummaryTool", ToolSvc.CombinedMuonTrackSummary)
@@ -182,7 +179,7 @@ def MuonTrackQuery( name="MuonTrackQuery", **kwargs ):
def MuidSegmentRegionRecoveryTool( name ='MuidSegmentRegionRecoveryTool', **kwargs ):
kwargs.setdefault("Builder", getPublicTool("CombinedMuonTrackBuilderFit") )
- import MuonCombinedRecExample.CombinedMuonTrackSummary
+ import MuonCombinedRecExample.CombinedMuonTrackSummary # noqa: F401 (import side-effects)
from AthenaCommon.AppMgr import ToolSvc
kwargs.setdefault("TrackSummaryTool", ToolSvc.CombinedMuonTrackSummary)
@@ -210,8 +207,7 @@ def MuidSegmentRegionRecoveryTool( name ='MuidSegmentRegionRecoveryTool', **kwar
def MuonMaterialProviderTool( name = "MuonMaterialProviderTool"):
- from TrkExTools.AtlasExtrapolator import AtlasExtrapolator
- from TrackToCalo.TrackToCaloConf import Trk__ParticleCaloExtensionTool, Rec__MuonCaloEnergyTool, Rec__ParticleCaloCellAssociationTool
+ from TrackToCalo.TrackToCaloConf import Rec__MuonCaloEnergyTool, Rec__ParticleCaloCellAssociationTool
from TrkMaterialProvider.TrkMaterialProviderConf import Trk__TrkMaterialProviderTool
caloCellAssociationTool = Rec__ParticleCaloCellAssociationTool(ParticleCaloExtensionTool = getPublicTool("MuonParticleCaloExtensionTool"))
from AthenaCommon.AppMgr import ToolSvc
@@ -221,7 +217,7 @@ def MuonMaterialProviderTool( name = "MuonMaterialProviderTool"):
ParticleCaloCellAssociationTool = caloCellAssociationTool)
ToolSvc += muonCaloEnergyTool
- materialProviderTool = Trk__TrkMaterialProviderTool(MuonCaloEnergyTool = muonCaloEnergyTool);
+ materialProviderTool = Trk__TrkMaterialProviderTool(MuonCaloEnergyTool = muonCaloEnergyTool)
if TriggerFlags.MuonSlice.doTrigMuonConfig:
materialProviderTool.UseCaloEnergyMeasurement = False
return materialProviderTool
@@ -285,7 +281,7 @@ def CombinedMuonTrackBuilderFit( name='CombinedMuonTrackBuilderFit', **kwargs ):
kwargs.setdefault("Cleaner" , getPrivateToolClone("TrigMuidTrackCleaner_"+suffix,"MuidTrackCleaner", Fitter=kwargs["Fitter"]) )
else:
- import MuonCombinedRecExample.CombinedMuonTrackSummary
+ import MuonCombinedRecExample.CombinedMuonTrackSummary # noqa: F401 (import side-effects)
kwargs.setdefault("TrackSummaryTool" , ToolSvc.CombinedMuonTrackSummary )
kwargs.setdefault("Propagator" , getPublicTool("MuonCombinedPropagator") )
kwargs.setdefault("SLPropagator" , getPublicTool("MuonCombinedPropagator") )
@@ -355,7 +351,7 @@ def CombinedMuonTrackBuilder( name='CombinedMuonTrackBuilder', **kwargs ):
kwargs.setdefault("CscRotCreator" , "" )
kwargs.setdefault("Cleaner" , getPrivateToolClone("TrigMuidTrackCleaner_"+suffix, "MuidTrackCleaner", Fitter=kwargs["Fitter"]) )
else:
- import MuonCombinedRecExample.CombinedMuonTrackSummary
+ import MuonCombinedRecExample.CombinedMuonTrackSummary # noqa: F401 (import side-effects)
kwargs.setdefault("MuonHoleRecovery" , getPublicTool("MuidSegmentRegionRecoveryTool") )
kwargs.setdefault("TrackSummaryTool" , ToolSvc.CombinedMuonTrackSummary )
kwargs.setdefault("Propagator" , getPublicTool("MuonCombinedPropagator") )
diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedRecExampleConfigDb.py b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedRecExampleConfigDb.py
index 523dc66a2aa8..37df8e5880de 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedRecExampleConfigDb.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedRecExampleConfigDb.py
@@ -1,12 +1,7 @@
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-from AthenaCommon.CfgGetter import addTool, addToolClone, addService, addAlgorithm, \
- addTypesToExcludeIfDefaultValue, addNamesToExcludeIfDefaultValue, addFullNamesToExcludeIfDefaultValue, \
- addPropertiesToExcludeIfDefault, \
- addTypesToSkipIfNotAvailable, addNamesToSkipIfNotAvailable, addFullNamesToSkipIfNotAvailable, \
- addTypesOnlyToSkip
+from AthenaCommon.CfgGetter import addTool, addAlgorithm
-from AthenaCommon.Constants import * # FATAL,ERROR etc.
# combined tools
addTool("MuonCombinedRecExample.MuonCombinedTools.MuonCombinedTool","MuonCombinedTool")
diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedRecFlags.py b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedRecFlags.py
index e7c94f4e2666..85e4a83d1b07 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedRecFlags.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedRecFlags.py
@@ -1,22 +1,12 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
__doc__ = """Flags to steer Muon Combined Reconstruction."""
-from AthenaCommon.JobProperties import JobProperty,JobPropertyContainer,jobproperties
-from AthenaCommon.Logging import logging
-from AthenaCommon import BeamFlags
-from AthenaCommon import BFieldFlags
-beamFlags = jobproperties.Beam
-
-from RecExConfig.RecFlags import rec
-from RecExConfig.RecAlgsFlags import recAlgs
-
+from AthenaCommon.JobProperties import JobProperty,JobPropertyContainer
+from AthenaCommon.BeamFlags import jobproperties
+from MuonRecExample.MuonRecUtils import fillJobPropertyContainer,SummaryJobProperty
from MuonRecExample.MuonRecFlags import muonRecFlags,muonStandaloneFlags
-from MuonRecExample.MuonRecUtils import logMuon,fillJobPropertyContainer,override_lock_and_set_Value,SummaryJobProperty
-from InDetRecExample.InDetJobProperties import InDetFlags
-
-logMuonComb = logging.getLogger("MuonCombinedRec")
#
# Flags for general use
@@ -175,7 +165,6 @@ class MuonCombinedRec(JobPropertyContainer):
"""The flags to steer muon combined reconstruction"""
def setDefaults(self):
- global beamFlags,muonRecFlags,muonStandaloneFlags
# set defaults of the flags that its using
muonRecFlags.setDefaults()
@@ -183,7 +172,7 @@ class MuonCombinedRec(JobPropertyContainer):
from MuonRecExample.MuonRecUtils import setJobPropertyDefault as setDefault
- haveMuonTracks = muonRecFlags.doStandalone() and self.doAOD
+# haveMuonTracks = muonRecFlags.doStandalone() and self.doAOD
# This logic doesn't work - doAOD seems to be off with Vakho's standard test
# if not haveMuonTracks:
# if not muonRecFlags.doStandalone():
@@ -192,7 +181,7 @@ class MuonCombinedRec(JobPropertyContainer):
# print "turning off doxAOD because doAOD is off"
# setDefault(self.doxAOD,False)
- if beamFlags.beamType()=='cosmics' or beamFlags.beamType()=='singlebeam':
+ if jobproperties.Beam.beamType()=='cosmics' or jobproperties.Beam.beamType()=='singlebeam':
# Algorithms for CaloMuonCollection
setDefault(self.doCaloTrkMuId,self.doAOD())
# Algorithms for MuGirlLowBetaCollection
@@ -205,7 +194,7 @@ class MuonCombinedRec(JobPropertyContainer):
#setDefault(self.doMuGirlLowBeta,self.doAOD())
#setDefault(self.doMuGirl,self.doAOD()) # also for new MuonCollection
- if beamFlags.beamType()=='cosmics':
+ if jobproperties.Beam.beamType()=='cosmics':
setDefault(self.doLArMuId,True)
else:
setDefault(self.doLArMuId,False)
diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedRecOnlySetup.py b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedRecOnlySetup.py
index d7b92c35741b..2dd40ee304ef 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedRecOnlySetup.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedRecOnlySetup.py
@@ -1,17 +1,15 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
__doc__ = """Configure all flags (for RecExCommon) so that only Muon Standalone and Muon Combined reconstruction are run"""
from AthenaCommon.DetFlags import DetFlags
-from AthenaCommon.GlobalFlags import globalflags,GlobalFlags
from RecExConfig.RecFlags import rec as recFlags
from RecExConfig.RecAlgsFlags import recAlgs as recAlgsFlags
-from RecExConfig.RecConfFlags import recConfFlags
from InDetRecExample.InDetJobProperties import InDetFlags
from MuonCombinedRecExample.MuonCombinedRecFlags import muonCombinedRecFlags
# import standalone to avoid that it overwrites combined later on
-import MuonRecExample.MuonRecStandaloneOnlySetup
+import MuonRecExample.MuonRecStandaloneOnlySetup # noqa: F401 (import side-effects)
# Output
recFlags.doWriteESD = False
diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedTools.py b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedTools.py
index 3b5d2a405387..bcfed3b938bc 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedTools.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedTools.py
@@ -1,19 +1,12 @@
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
from MuonCombinedRecExample.MuonCombinedRecFlags import muonCombinedRecFlags
-from MuonCombinedRecExample.MuonCombinedKeys import MuonCombinedKeys as MuonCbKeys
-from MuonRecExample.MuonRecFlags import muonRecFlags
from AthenaCommon.AppMgr import ToolSvc
-
-from AthenaCommon.Resilience import protectedInclude
-
from AthenaCommon import CfgMgr
-from AthenaCommon.CfgGetter import getPrivateTool,getPrivateToolClone,getPublicTool,getPublicToolClone,getService,getServiceClone
+from AthenaCommon.CfgGetter import getPublicTool, getPublicToolClone
from AthenaCommon.BeamFlags import jobproperties
beamFlags = jobproperties.Beam
-from AthenaCommon.GlobalFlags import globalflags
-from RecExConfig.RecFlags import rec
from TriggerJobOpts.TriggerFlags import TriggerFlags
def MuonCombinedInDetDetailedTrackSelectorTool( name='MuonCombinedInDetDetailedTrackSelectorTool', **kwargs):
@@ -71,7 +64,7 @@ def MuonCombinedParticleCreator(name="MuonCombinedParticleCreator",**kwargs):
if TriggerFlags.MuonSlice.doTrigMuonConfig:
kwargs.setdefault("TrackSummaryTool" , getPublicTool("MuonTrackSummaryTool") )
else:
- import MuonCombinedRecExample.CombinedMuonTrackSummary
+ import MuonCombinedRecExample.CombinedMuonTrackSummary # noqa: F401 (import side-effects)
kwargs.setdefault("TrackSummaryTool", ToolSvc.CombinedMuonTrackSummary ) #getPublicTool("CombinedMuonTrackSummary") )
kwargs.setdefault("Extrapolator", getPublicTool("AtlasExtrapolator") )
kwargs.setdefault("KeepAllPerigee",True )
@@ -81,7 +74,7 @@ def MuonCombinedParticleCreator(name="MuonCombinedParticleCreator",**kwargs):
return CfgMgr.Trk__TrackParticleCreatorTool(name,**kwargs)
def MuonCaloParticleCreator(name="MuonCaloParticleCreator",**kwargs):
- import MuonCombinedRecExample.CombinedMuonTrackSummary
+ import MuonCombinedRecExample.CombinedMuonTrackSummary # noqa: F401 (import side-effects)
kwargs.setdefault("Extrapolator", getPublicTool("AtlasExtrapolator") )
kwargs.setdefault("TrackSummaryTool", ToolSvc.CombinedMuonTrackSummary ) #getPublicTool("CombinedMuonTrackSummary") )
kwargs.setdefault("KeepAllPerigee",True )
@@ -108,7 +101,7 @@ def MuonCreatorTool(name="MuonCreatorTool",**kwargs):
getPublicTool("MuonMomentumBalanceSignificanceTool")
getPublicTool("MuonScatteringAngleSignificanceTool")
getPublicTool("MuonCaloParticleCreator")
- import MuonCombinedRecExample.CombinedMuonTrackSummary
+ import MuonCombinedRecExample.CombinedMuonTrackSummary # noqa: F401 (import side-effects)
from AthenaCommon.AppMgr import ToolSvc
kwargs.setdefault("TrackSummaryTool", ToolSvc.CombinedMuonTrackSummary)
@@ -130,7 +123,7 @@ def MuonCreatorTool_LRT(name="MuonCreatorTool_LRT",**kwargs):
getPublicTool("MuonMomentumBalanceSignificanceTool")
getPublicTool("MuonScatteringAngleSignificanceTool")
getPublicTool("MuonCaloParticleCreator")
- import MuonCombinedRecExample.CombinedMuonTrackSummary
+ import MuonCombinedRecExample.CombinedMuonTrackSummary # noqa: F401 (import side-effects)
from AthenaCommon.AppMgr import ToolSvc
kwargs.setdefault("TrackSummaryTool", ToolSvc.CombinedMuonTrackSummary)
@@ -149,7 +142,7 @@ def ExtrapolateMuonToIPTool(name="ExtrapolateMuonToIPTool",**kwargs):
if TriggerFlags.MuonSlice.doTrigMuonConfig:
kwargs.setdefault("TrackSummaryTool", getPublicTool("MuonTrackSummaryTool"))
else:
- import MuonCombinedRecExample.CombinedMuonTrackSummary
+ import MuonCombinedRecExample.CombinedMuonTrackSummary # noqa: F401 (import side-effects)
from AthenaCommon.AppMgr import ToolSvc
kwargs.setdefault("TrackSummaryTool", ToolSvc.CombinedMuonTrackSummary)
return CfgMgr.ExtrapolateMuonToIPTool(name,**kwargs)
diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonSegmentTaggerTools.py b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonSegmentTaggerTools.py
index 347d51cb61a1..7be4911a6bea 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonSegmentTaggerTools.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonSegmentTaggerTools.py
@@ -1,17 +1,8 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from MuonCombinedRecExample.MuonCombinedRecFlags import muonCombinedRecFlags
-from MuonCombinedRecExample.MuonCombinedKeys import MuonCombinedKeys as MuonCbKeys
-from MuonRecExample.MuonRecFlags import muonRecFlags
-from AthenaCommon.AppMgr import ToolSvc
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
from AthenaCommon import CfgMgr
-from AthenaCommon.CfgGetter import getPrivateTool,getPrivateToolClone,getPublicTool,getAlgorithm,getPublicToolClone,getService,getServiceClone
-from AthenaCommon.BeamFlags import jobproperties
-beamFlags = jobproperties.Beam
+from AthenaCommon.CfgGetter import getPublicTool
-from AthenaCommon.GlobalFlags import globalflags
-from RecExConfig.RecFlags import rec
def MuTagMatchingTool( name='MuTagMatchingTool', **kwargs ):
kwargs.setdefault("AssumeLocalErrors", True )
diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/ScaleCalibrationInputSetup.py b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/ScaleCalibrationInputSetup.py
index 4894d6e13adf..aaa2cea36959 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/ScaleCalibrationInputSetup.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/ScaleCalibrationInputSetup.py
@@ -1,11 +1,12 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-from __future__ import print_function
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
from AthenaCommon.AlgSequence import AlgSequence
+from AthenaCommon.Constants import INFO
from AthenaCommon import CfgMgr
+import os
def setupScaleCalibrationInput():
+ from AthenaCommon.AppMgr import ServiceMgr, ToolSvc
print("Setting up setupScaleCalibrationInput")
topSequence = AlgSequence()
@@ -17,7 +18,7 @@ def setupScaleCalibrationInput():
# Setup GRL
GRL = os.path.expandvars( '$TestArea/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonPtCalibNtupleMaker/grl/data12_8TeV.periodAllYear_HEAD_DQDefects-00-01-02_PHYS_CombinedPerf_Muon_Muon_calo.xml' )
ToolSvc += CfgMgr.GoodRunsListSelectionTool( 'GRLTool' , GoodRunsListVec = [ GRL ] )
-
+
# Setup MST
ToolSvc += CfgMgr.CP__MuonSelectionTool( 'MuonSelectorTool', OutputLevel = INFO )
ToolSvc += CfgMgr.CalibMuonsSelectorTool( 'CalibMuonsSelectorTool', MuonSelectorTool = ToolSvc.MuonSelectorTool, OutputLevel = INFO )
diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/TagAndProbeInputSetup.py b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/TagAndProbeInputSetup.py
index 635cdf8cc4fb..e9d657bea796 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/TagAndProbeInputSetup.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/TagAndProbeInputSetup.py
@@ -1,6 +1,4 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-from __future__ import print_function
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
from AthenaCommon.Include import include
--
GitLab
From a09cc4d633e9c5751fda32dbae331eb3908973ae Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <fwinkl@cern>
Date: Mon, 7 Dec 2020 13:36:50 +0100
Subject: [PATCH 4/4] MuonCombinedRecExample: delete obsolete calibration
modules
Delete obsolete `ScaleCalibrationInputSetup.py` and
`TagAndProbeInputSetup.py` modules and their corresponding
`MuonCombinedRecFlags`.
---
.../python/MuonCombinedRecFlags.py | 10 ---
.../python/ScaleCalibrationInputSetup.py | 27 --------
.../python/TagAndProbeInputSetup.py | 68 -------------------
.../share/MuonCombinedRec_postprocessing.py | 8 ---
4 files changed, 113 deletions(-)
delete mode 100644 Reconstruction/MuonIdentification/MuonCombinedRecExample/python/ScaleCalibrationInputSetup.py
delete mode 100644 Reconstruction/MuonIdentification/MuonCombinedRecExample/python/TagAndProbeInputSetup.py
diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedRecFlags.py b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedRecFlags.py
index 85e4a83d1b07..481b41b04e88 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedRecFlags.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedRecFlags.py
@@ -144,16 +144,6 @@ class printSummary(JobProperty):
allowedTypes=['bool']
StoredValue=False
-class createTagAndProbeInput(JobProperty):
- statusOn=True
- allowedTypes=['bool']
- StoredValue=False
-
-class createScaleCalibrationInput(JobProperty):
- statusOn=True
- allowedTypes=['bool']
- StoredValue=False
-
## Decide whether to wrap the new configuration in the old.
class useNewConfig(JobProperty):
statusOn=True
diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/ScaleCalibrationInputSetup.py b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/ScaleCalibrationInputSetup.py
deleted file mode 100644
index aaa2cea36959..000000000000
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/ScaleCalibrationInputSetup.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-
-from AthenaCommon.AlgSequence import AlgSequence
-from AthenaCommon.Constants import INFO
-from AthenaCommon import CfgMgr
-import os
-
-def setupScaleCalibrationInput():
- from AthenaCommon.AppMgr import ServiceMgr, ToolSvc
- print("Setting up setupScaleCalibrationInput")
-
- topSequence = AlgSequence()
- # THistSvc configuration
- from GaudiSvc.GaudiSvcConf import THistSvc
- ServiceMgr += THistSvc()
- ServiceMgr.THistSvc.Output += [ "MCPCALIB DATAFILE='MCPCalibNtuple_xAOD.root' OPT='RECREATE'" ]
-
- # Setup GRL
- GRL = os.path.expandvars( '$TestArea/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonPtCalibNtupleMaker/grl/data12_8TeV.periodAllYear_HEAD_DQDefects-00-01-02_PHYS_CombinedPerf_Muon_Muon_calo.xml' )
- ToolSvc += CfgMgr.GoodRunsListSelectionTool( 'GRLTool' , GoodRunsListVec = [ GRL ] )
-
- # Setup MST
- ToolSvc += CfgMgr.CP__MuonSelectionTool( 'MuonSelectorTool', OutputLevel = INFO )
- ToolSvc += CfgMgr.CalibMuonsSelectorTool( 'CalibMuonsSelectorTool', MuonSelectorTool = ToolSvc.MuonSelectorTool, OutputLevel = INFO )
-
- # Setup algorithm
- topSequence += CfgMgr.CalibMuonsNtupleMaker( 'CalibMuonsNtupleMaker', OutputLevel = INFO, SelectorTool = SelectorTool, ExtendedVersion = False )
diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/TagAndProbeInputSetup.py b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/TagAndProbeInputSetup.py
deleted file mode 100644
index e9d657bea796..000000000000
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/TagAndProbeInputSetup.py
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-
-from AthenaCommon.Include import include
-
-
-def setupTagAndProbeInput():
- print("Setting up setupTagAndProbeInput")
-
- #from MuonPerformanceAlgs.ZmumuTPAnalysis import *
- #from MuonPerformanceAlgs.ZmumuTPIsolationAnalysis import *
- #from MuonPerformanceAlgs.ZmumuTPTrigAnalysis import *
- include('MuonPerformanceAlgs/ZmumuTPAnalysis.py')
- include('MuonPerformanceAlgs/ZmumuTPIsolationAnalysis.py')
- include('MuonPerformanceAlgs/ZmumuTPTrigAnalysis.py')
-
- # now we can add the TP analysis/es itself/themselves :)
-
- ############## Zmumu T&P Configuration ########################
- do_Zmumu_RecoEff_TagProbe = True # this is for Z->mumu, reco eff. You can add your own analysis in a similar way.
- do_Zmumu_IsolationEff_TagProbe = True # this is for Z->mumu, isolation eff. You can add your own analysis in a similar way.
- do_Zmumu_Trigger_TagProbe = True # this is for Z->mumu, Trigger eff.
-
- ##### General analysis options
- writeNtuple = True # Write an ntuple on top of the histos - for detailed studies, but increases output file size
- doEtaSlices = False
- doClosure = False
- doDRSys = False
- doValid = False
-
-
- # Add utilities (tool, upstream algorithms) we need
- AddIsolationTools()
- AddTrigDecisionTool()
- AddTrigMatchingTool()
- AddMuonSelectionTool()
-
-
- ##### Reco eff analysis options
- if do_Zmumu_RecoEff_TagProbe:
- writeNtuple = True
- doEtaSlices = False
- doClosure = False
- doDRSys = True
- doValid = True
- AddZmumuTPAnalysis(doEtaSlices,writeNtuple,doClosure,doDRSys,doValid)
- ###############################################################
-
-
- ##### Isolation eff analysis options
- if do_Zmumu_IsolationEff_TagProbe:
- doEtaSlices = False
- doClosure = False
- doDRSys = True
- doValid = True
- AddZmumuTPIsolationAnalysis(doEtaSlices,writeNtuple,doClosure,doDRSys)
- pass
- ###############################################################
-
-
- ##### Trigger analysis options
- if do_Zmumu_Trigger_TagProbe:
- doTriggerL1 = True
- doTriggerL2 = False
- doTriggerEF = False
- doTriggerHLT = True
- doEtaSlices = True
- doDRSys = False
- AddTriggerTPAnalysis(doEtaSlices,writeNtuple,doClosure,doDRSys,doL1=doTriggerL1,doL2=doTriggerL2,doEF=doTriggerEF,doHLT=doTriggerHLT)
diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/share/MuonCombinedRec_postprocessing.py b/Reconstruction/MuonIdentification/MuonCombinedRecExample/share/MuonCombinedRec_postprocessing.py
index a662293fd218..4f735164d3aa 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/share/MuonCombinedRec_postprocessing.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedRecExample/share/MuonCombinedRec_postprocessing.py
@@ -52,14 +52,6 @@ if rec.doTruth() and muonCombinedRecFlags.doxAOD() and rec.doMuonCombined():
if muonCombinedRecFlags.doTrackPerformance:
include("MuonCombinedRecExample/MuonCombinedTrackPerformance_jobOptions.py")
-if( muonCombinedRecFlags.createTagAndProbeInput() ):
- from MuonCombinedRecExample.TagAndProbeInputSetup import setupTagAndProbeInput
- setupTagAndProbeInput()
-
-if( muonCombinedRecFlags.createScaleCalibrationInput() ):
- from MuonCombinedRecExample.ScaleCalibrationInputSetup import setupScaleCalibrationInput
- setupScaleCalibrationInput()
-
if rec.doMuonCombined() and rec.doJetMissingETTag() and muonCombinedRecFlags.doxAOD():
muonTCLinkAlg = CfgMgr.ClusterMatching__CaloClusterMatchLinkAlg("MuonTCLinks",ClustersToDecorate="MuonClusterCollection")
topSequence += muonTCLinkAlg
--
GitLab