diff --git a/Reconstruction/Jet/JetMonitoring/python/JetHistoTools.py b/Reconstruction/Jet/JetMonitoring/python/JetHistoTools.py index 6ae3a4b5b2b7f1b204568b309132a222e42625d6..6486fc032074fadfd8f8a0076084aaed29038aaf 100644 --- a/Reconstruction/Jet/JetMonitoring/python/JetHistoTools.py +++ b/Reconstruction/Jet/JetMonitoring/python/JetHistoTools.py @@ -164,6 +164,13 @@ compactSpecification = { #RG and ZG "rg": (("rg; rg;",29,-1.2,1.7), ("rg", "float") ), "zg": (("zg; zg;",19,-1.2,0.7), ("zg", "float") ), + + #Variables for track jets + "HadronConeExclTruthLabelID": (("HadronConeExclTruthLabelID; HadronConeExclTruthLabelID;", 150, -100.5, 49.5), ("HadronConeExclTruthLabelID", "int") ), + "HadronConeExclExtendedTruthLabelID": (("HadronConeExclExtendedTruthLabelID; HadronConeExclExtendedTruthLabelID; ;", 150, -100.5, 49.5), ("HadronConeExclExtendedTruthLabelID", "int")), + "HadronGhostTruthLabelID": (("HadronGhostTruthLabelID; HadronGhostTruthLabelID;", 150, -100.5, 49.5), ("HadronGhostTruthLabelID", "int")), + "HadronGhostExtendedTruthLabelID": (("HadronGhostExtendedTruthLabelID; HadronGhostExtendedTruthLabelID;", 150, -100.5, 49.5), ("HadronGhostExtendedTruthLabelID", "int")), + # 2D Histo format is # "histoname" : ( binning, attributeInfo1, attributeInfo2 ) # where diff --git a/Reconstruction/Jet/JetValidation/python/PhysicsValidationHistos.py b/Reconstruction/Jet/JetValidation/python/PhysicsValidationHistos.py index cf7e45f276b9906fc84d5f5cfbc138a360c445d9..3e46020fa5a77e363ee6362e19f32d5a2ab5eff8 100644 --- a/Reconstruction/Jet/JetValidation/python/PhysicsValidationHistos.py +++ b/Reconstruction/Jet/JetValidation/python/PhysicsValidationHistos.py @@ -48,7 +48,6 @@ def commonPhysValTool(container, refcontainer="", onlyKinematics = False, global selectionAndHistos( "leadingjet" , [ "basickinematics", ] ), selectionAndHistos( "subleadingjet" , [ "basickinematics"] ), selectionAndHistos("40000<pt<50000",["pt"]), - jhm.Width, # distances between 2 leading jets. jhm.leadingjetrel, @@ -56,7 +55,9 @@ def commonPhysValTool(container, refcontainer="", onlyKinematics = False, global if ( ("Topo" in container or "PFlow" in container) and "Trimmed" not in container) and "SoftDrop" not in container: filler.HistoTools += [ - + + jhm.Width, + # jet states jhm.basickinematics_emscale, #track variables @@ -181,6 +182,14 @@ def commonPhysValTool(container, refcontainer="", onlyKinematics = False, global jhm.Charge, ] + if 'PV0Track' in container: + filler.HistoTools += [ + jhm.HadronConeExclTruthLabelID, + jhm.HadronConeExclExtendedTruthLabelID, + jhm.HadronGhostTruthLabelID, + jhm.HadronGhostExtendedTruthLabelID, + ] + #filler.OutputLevel =2 return containerfiller @@ -197,17 +206,13 @@ globalSelection = "" athenaMonTool = JetMonitoringTool(HistoTools = [ commonPhysValTool( "AntiKt4LCTopoJets", akt4refContainer ,globalSelection = globalSelection), commonPhysValTool( "AntiKt4EMTopoJets", akt4refContainer ,globalSelection = globalSelection), - # the containers that are commented out are kept so as to make it possible to swicth them on in the future if needed - #commonPhysValTool( "AntiKt10LCTopoJets" ), + commonPhysValTool( "AntiKt4EMPFlowJets", akt4refContainer ,globalSelection = globalSelection ), + commonPhysValTool( "AntiKt4TruthJets" ), commonPhysValTool( "AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets" ), commonPhysValTool( "AntiKt10UFOCSSKSoftDropBeta100Zcut10Jets" ), - commonPhysValTool( "AntiKt10TruthSoftDropBeta100Zcut10Jets" ), - #commonPhysValTool( "AntiKt10PV0TracksJets" ), - #commonPhysValTool( "AntiKt10TruthJets" ), commonPhysValTool( "AntiKt10TruthTrimmedPtFrac5SmallR20Jets" ), - commonPhysValTool( "AntiKt4EMPFlowJets" ), - commonPhysValTool( "AntiKt4TruthJets" ), - #commonPhysValTool( "AntiKt10TruthWZJets" ), + commonPhysValTool( "AntiKt10TruthSoftDropBeta100Zcut10Jets" ), + commonPhysValTool( "AntiKtVR30Rmax4Rmin02PV0TrackJets"), ], IntervalType=8) # 8 == HistoGroupBase::all @@ -215,11 +220,10 @@ if not isMC: athenaMonTool = JetMonitoringTool(HistoTools = [ commonPhysValTool( "AntiKt4LCTopoJets", akt4refContainer ,globalSelection = globalSelection), commonPhysValTool( "AntiKt4EMTopoJets", akt4refContainer ,globalSelection = globalSelection), - # the containers that are commented out are kept so as to make it possible to swicth them on in the future if needed - commonPhysValTool( "AntiKt10LCTopoJets" ), - commonPhysValTool( "AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets" ), - # commonPhysValTool( "AntiKt2PV0TrackJets" ), commonPhysValTool( "AntiKt4EMPFlowJets" ), + commonPhysValTool( "AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets" ), + commonPhysValTool( "AntiKt10UFOCSSKSoftDropBeta100Zcut10Jets" ), + commonPhysValTool( "AntiKtVR30Rmax4Rmin02PV0TrackJets"), ], IntervalType=8) # 8 == HistoGroupBase::all #ToolSvc += athenaMonTool