Skip to content
Snippets Groups Projects
Commit 711896bc authored by Johannes Junggeburth's avatar Johannes Junggeburth :dog2:
Browse files

Add large d0 tracks to physics validation

parent aa803a83
No related branches found
No related tags found
6 merge requests!58791DataQualityConfigurations: Modify L1Calo config for web display,!46784MuonCondInterface: Enable thread-safety checking.,!46776Updated LArMonitoring config file for WD to match new files produced using MT,!45405updated ART test cron job,!42417Draft: DIRE and VINCIA Base Fragments for Pythia 8.3,!36175Add muons built from large d0 tracking.
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration # Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# #
## purpose Python module to hold common flags to configure the InDetPhysValMonitoring ## purpose Python module to hold common flags to configure the InDetPhysValMonitoring
## ##
from __future__ import print_function from __future__ import print_function
...@@ -44,6 +44,11 @@ class InDetPhysValFlagsJobProperty(JobProperty): ...@@ -44,6 +44,11 @@ class InDetPhysValFlagsJobProperty(JobProperty):
else: else:
return self.StoredValue return self.StoredValue
class doValidateLargeD0Tracks(InDetPhysValFlagsJobProperty):
statusOn = True
allowedTypes = ['bool']
StoredValue = False
class doValidateDBMTracks(InDetPhysValFlagsJobProperty): class doValidateDBMTracks(InDetPhysValFlagsJobProperty):
statusOn = True statusOn = True
allowedTypes = ['bool'] allowedTypes = ['bool']
...@@ -138,7 +143,7 @@ class InDetPhysValJobProperties(JobPropertyContainer): ...@@ -138,7 +143,7 @@ class InDetPhysValJobProperties(JobPropertyContainer):
if hasattr(InDetFlags,'doDBM') and not InDetFlags.doDBM() : if hasattr(InDetFlags,'doDBM') and not InDetFlags.doDBM() :
self.checkThenSet(self.doValidateDBMTracks, False) self.checkThenSet(self.doValidateDBMTracks, False)
print (self) print (self)
def printInfo(self) : def printInfo(self) :
pass pass
...@@ -150,7 +155,7 @@ jobproperties.add_Container(InDetPhysValJobProperties) ...@@ -150,7 +155,7 @@ jobproperties.add_Container(InDetPhysValJobProperties)
_list_InDetPhysValJobProperties = [ _list_InDetPhysValJobProperties = [
Enabled, Enabled,
doValidateDBMTracks, doValidateDBMTracks,
doValidateGSFTracks, doValidateGSFTracks,
doValidateLooseTracks, doValidateLooseTracks,
doValidateTightPrimaryTracks, doValidateTightPrimaryTracks,
doValidateTracksInJets, doValidateTracksInJets,
...@@ -158,7 +163,8 @@ _list_InDetPhysValJobProperties = [ ...@@ -158,7 +163,8 @@ _list_InDetPhysValJobProperties = [
validateExtraTrackCollections, validateExtraTrackCollections,
doPhysValOutput, doPhysValOutput,
doExpertOutput, doExpertOutput,
setTruthStrategy setTruthStrategy,
doValidateLargeD0Tracks
] ]
for j in _list_InDetPhysValJobProperties: for j in _list_InDetPhysValJobProperties:
......
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration # Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
from __future__ import print_function from __future__ import print_function
from InDetPhysValMonitoring.ConfigUtils import serviceFactory,toolFactory from InDetPhysValMonitoring.ConfigUtils import serviceFactory,toolFactory
...@@ -61,13 +61,13 @@ def getInDetPhysValMonitoringTool(**kwargs) : ...@@ -61,13 +61,13 @@ def getInDetPhysValMonitoringTool(**kwargs) :
kwargs=setDefaults(kwargs, kwargs=setDefaults(kwargs,
JetContainerName ='' , JetContainerName ='' ,
FillTrackInJetPlots = False) FillTrackInJetPlots = False)
#adding the VeretxTruthMatchingTool #adding the VeretxTruthMatchingTool
from InDetTruthVertexValidation.InDetTruthVertexValidationConf import InDetVertexTruthMatchTool from InDetTruthVertexValidation.InDetTruthVertexValidationConf import InDetVertexTruthMatchTool
kwargs=setDefaults(kwargs, kwargs=setDefaults(kwargs,
useVertexTruthMatchTool = True, useVertexTruthMatchTool = True,
VertexTruthMatchTool = toolFactory(InDetVertexTruthMatchTool) ) VertexTruthMatchTool = toolFactory(InDetVertexTruthMatchTool) )
#Options for Truth Strategy : Requires full pile-up truth containers for some #Options for Truth Strategy : Requires full pile-up truth containers for some
if InDetPhysValFlags.setTruthStrategy() == 'All' or InDetPhysValFlags.setTruthStrategy() == 'PileUp' : if InDetPhysValFlags.setTruthStrategy() == 'All' or InDetPhysValFlags.setTruthStrategy() == 'PileUp' :
from RecExConfig.AutoConfiguration import IsInInputFile from RecExConfig.AutoConfiguration import IsInInputFile
...@@ -78,9 +78,9 @@ def getInDetPhysValMonitoringTool(**kwargs) : ...@@ -78,9 +78,9 @@ def getInDetPhysValMonitoringTool(**kwargs) :
print ('WARNING Truth Strategy for InDetPhysValMonitoring set to %s but TruthPileupEvents are missing in the input; resetting to HardScatter only' % (InDetPhysValFlags.setTruthStrategy())) print ('WARNING Truth Strategy for InDetPhysValMonitoring set to %s but TruthPileupEvents are missing in the input; resetting to HardScatter only' % (InDetPhysValFlags.setTruthStrategy()))
elif InDetPhysValFlags.setTruthStrategy() != 'HardScatter' : elif InDetPhysValFlags.setTruthStrategy() != 'HardScatter' :
print ('WARNING Truth Strategy for for InDetPhysValMonitoring set to invalid option %s; valid flags are ["HardScatter", "All", "PileUp"]' % (InDetPhysValFlags.setTruthStrategy())) print ('WARNING Truth Strategy for for InDetPhysValMonitoring set to invalid option %s; valid flags are ["HardScatter", "All", "PileUp"]' % (InDetPhysValFlags.setTruthStrategy()))
else : else :
...@@ -165,3 +165,14 @@ def getInDetPhysValMonitoringToolDBM(**kwargs) : ...@@ -165,3 +165,14 @@ def getInDetPhysValMonitoringToolDBM(**kwargs) :
useTrackSelection = True) useTrackSelection = True)
return getInDetPhysValMonitoringTool(**kwargs) return getInDetPhysValMonitoringTool(**kwargs)
def getInDetLargeD0PhysValMonitoringTool(**kwargs) :
from InDetRecExample.InDetJobProperties import InDetFlags
from InDetRecExample.InDetKeys import InDetKeys
kwargs=setDefaults(kwargs,
name = 'InDetPhysValMonitoringToolLargeD0',
SubFolder = 'LargeD0/',
TrackParticleContainerName = InDetKeys.xAODLargeD0TrackParticleContainer() if InDetFlags.storeSeparateLargeD0Container() else InDetKeys.xAODTrackParticleContainer(),
useTrackSelection = True)
return getInDetPhysValMonitoringTool(**kwargs)
...@@ -7,6 +7,7 @@ from InDetPhysValMonitoring.InDetPhysValJobProperties import InDetPhysValFlags ...@@ -7,6 +7,7 @@ from InDetPhysValMonitoring.InDetPhysValJobProperties import InDetPhysValFlags
import InDetPhysValMonitoring.InDetPhysValMonitoringTool as InDetPhysValMonitoringTool import InDetPhysValMonitoring.InDetPhysValMonitoringTool as InDetPhysValMonitoringTool
mons=[ (True , InDetPhysValMonitoringTool.getInDetPhysValMonitoringTool), mons=[ (True , InDetPhysValMonitoringTool.getInDetPhysValMonitoringTool),
(InDetPhysValFlags.doValidateLargeD0Tracks() , InDetPhysValMonitoringTool.getInDetLargeD0PhysValMonitoringTool),
(InDetPhysValFlags.doValidateLooseTracks() , InDetPhysValMonitoringTool.getInDetPhysValMonitoringToolLoose), (InDetPhysValFlags.doValidateLooseTracks() , InDetPhysValMonitoringTool.getInDetPhysValMonitoringToolLoose),
(InDetPhysValFlags.doValidateTightPrimaryTracks() , InDetPhysValMonitoringTool.getInDetPhysValMonitoringToolTightPrimary), (InDetPhysValFlags.doValidateTightPrimaryTracks() , InDetPhysValMonitoringTool.getInDetPhysValMonitoringToolTightPrimary),
(InDetPhysValFlags.doValidateDBMTracks() , InDetPhysValMonitoringTool.getInDetPhysValMonitoringToolDBM), (InDetPhysValFlags.doValidateDBMTracks() , InDetPhysValMonitoringTool.getInDetPhysValMonitoringToolDBM),
...@@ -17,7 +18,6 @@ for enabled, creator in mons : ...@@ -17,7 +18,6 @@ for enabled, creator in mons :
if enabled : if enabled :
monMan.AthenaMonTools += [ creator() ] monMan.AthenaMonTools += [ creator() ]
from InDetPhysValMonitoring.InDetPhysValMonitoringTool import getInDetPhysValMonitoringTool from InDetPhysValMonitoring.InDetPhysValMonitoringTool import getInDetPhysValMonitoringTool
from InDetPhysValMonitoring.InDetPhysValJobProperties import InDetPhysValFlags from InDetPhysValMonitoring.InDetPhysValJobProperties import InDetPhysValFlags
from InDetPhysValMonitoring.ConfigUtils import extractCollectionPrefix from InDetPhysValMonitoring.ConfigUtils import extractCollectionPrefix
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment