Commit 096f1c5f authored by scott snyder's avatar scott snyder Committed by scott snyder

DerivationFrameworkHiggs: MenuTruthThinning and HardTruthThinning for MT thinning.

Convert MenuTruthThinning and HardTruthThinning to use MT-compatible thinning.
Update uses of them (pass stream name rather than thinning service).
parent c9564a0a
......@@ -23,7 +23,7 @@ def TriggerChains(HIGG4DxName):
else :
assert False, "HIGG4DxThinning: Unknown derivation stream '{}'".format(HIGG4DxName)
def setup(HIGG4DxName, streamName, HIGG4DxThinningSvc, ToolSvc):
def setup(HIGG4DxName, streamName, ToolSvc):
thinningTools=[]
#jets and tracks
......@@ -157,7 +157,7 @@ def setup(HIGG4DxName, streamName, HIGG4DxThinningSvc, ToolSvc):
#thinning the master truth collection
from DerivationFrameworkMCTruth.DerivationFrameworkMCTruthConf import DerivationFramework__MenuTruthThinning
HIGG4DxTruthTool_MENU = DerivationFramework__MenuTruthThinning( name = HIGG4DxName+"TruthTool_MENU",
ThinningService = HIGG4DxThinningSvc,
StreamName = streamName,
WritePartons = False,
WriteHadrons = False,
WriteBHadrons = False,
......
......@@ -115,7 +115,7 @@ if useGenericTruthThinning:
else:
from DerivationFrameworkMCTruth.DerivationFrameworkMCTruthConf import DerivationFramework__MenuTruthThinning
HIGG2D1TruthThinningTool = DerivationFramework__MenuTruthThinning(name = "HIGG2D1TruthThinningTool",
ThinningService = "HIGG2D1ThinningSvc",
StreamName = streamName,
WritePartons = False,
WriteHadrons = False,
WriteBHadrons = True,
......
......@@ -105,7 +105,7 @@ if useGenericTruthThinning:
else:
from DerivationFrameworkMCTruth.DerivationFrameworkMCTruthConf import DerivationFramework__MenuTruthThinning
HIGG2D2TruthThinningTool = DerivationFramework__MenuTruthThinning(name = "HIGG2D2TruthThinningTool",
ThinningService = "HIGG2D2ThinningSvc",
StreamName = streamName,
WritePartons = False,
WriteHadrons = False,
WriteBHadrons = True,
......
......@@ -119,7 +119,7 @@ if useGenericTruthThinning:
else:
from DerivationFrameworkMCTruth.DerivationFrameworkMCTruthConf import DerivationFramework__MenuTruthThinning
HIGG2D4TruthThinningTool = DerivationFramework__MenuTruthThinning(name = "HIGG2D4TruthThinningTool",
ThinningService = "HIGG2D4ThinningSvc",
StreamName = streamName,
WritePartons = False,
WriteHadrons = False,
WriteBHadrons = True,
......
......@@ -263,7 +263,7 @@ if useGenericTruthThinning:
else:
from DerivationFrameworkMCTruth.DerivationFrameworkMCTruthConf import DerivationFramework__MenuTruthThinning
HIGG2D5TruthThinningTool = DerivationFramework__MenuTruthThinning(name = "HIGG2D5TruthThinningTool",
ThinningService = "HIGG2D5ThinningSvc",
StreamName = streamName,
WritePartons = False,
WriteHadrons = False,
WriteBHadrons = True,
......
......@@ -42,7 +42,7 @@ HIGG4D1ThinningHelper.TriggerChains = DerivationFrameworkHiggs.HIGG4DxThinning.T
HIGG4D1ThinningHelper.AppendToStream( HIGG4D1Stream )
# thinning tools
thinningTools = DerivationFrameworkHiggs.HIGG4DxThinning.setup(DAOD_StreamID, streamName, HIGG4D1ThinningHelper.ThinningSvc(), ToolSvc)
thinningTools = DerivationFrameworkHiggs.HIGG4DxThinning.setup(DAOD_StreamID, streamName, ToolSvc)
# skimming tools
import DerivationFrameworkHiggs.HIGG4DxSkimming
......
......@@ -42,7 +42,7 @@ HIGG4D2ThinningHelper.TriggerChains = DerivationFrameworkHiggs.HIGG4DxThinning.T
HIGG4D2ThinningHelper.AppendToStream( HIGG4D2Stream )
# thinning tools
thinningTools = DerivationFrameworkHiggs.HIGG4DxThinning.setup(DAOD_StreamID, streamName, HIGG4D2ThinningHelper.ThinningSvc(), ToolSvc)
thinningTools = DerivationFrameworkHiggs.HIGG4DxThinning.setup(DAOD_StreamID, streamName, ToolSvc)
# skimming tools
import DerivationFrameworkHiggs.HIGG4DxSkimming
......
......@@ -42,7 +42,7 @@ HIGG4D3ThinningHelper.TriggerChains = DerivationFrameworkHiggs.HIGG4DxThinning.T
HIGG4D3ThinningHelper.AppendToStream( HIGG4D3Stream )
# thinning tools
thinningTools = DerivationFrameworkHiggs.HIGG4DxThinning.setup(DAOD_StreamID, streamName, HIGG4D3ThinningHelper.ThinningSvc(), ToolSvc)
thinningTools = DerivationFrameworkHiggs.HIGG4DxThinning.setup(DAOD_StreamID, streamName, ToolSvc)
# skimming tools
import DerivationFrameworkHiggs.HIGG4DxSkimming
......
......@@ -42,7 +42,7 @@ HIGG4D4ThinningHelper.TriggerChains = DerivationFrameworkHiggs.HIGG4DxThinning.T
HIGG4D4ThinningHelper.AppendToStream( HIGG4D4Stream )
# thinning tools
thinningTools = DerivationFrameworkHiggs.HIGG4DxThinning.setup(DAOD_StreamID, streamName, HIGG4D4ThinningHelper.ThinningSvc(), ToolSvc)
thinningTools = DerivationFrameworkHiggs.HIGG4DxThinning.setup(DAOD_StreamID, streamName, ToolSvc)
# skimming tools
import DerivationFrameworkHiggs.HIGG4DxSkimming
......
......@@ -37,12 +37,8 @@ streamName = derivationFlags.WriteDAOD_HIGG6D1Stream.StreamName
fileName = buildFileName( derivationFlags.WriteDAOD_HIGG6D1Stream )
HIGG6D1Stream = MSMgr.NewPoolRootStream( streamName, fileName )
HIGG6D1Stream.AcceptAlgs(["HIGG6D1Kernel"])
# Special lines for thinning
# Thinning service name must match the one passed to the thinning tools
from AthenaServices.Configurables import ThinningSvc, createThinningSvc
augStream = MSMgr.GetStream( streamName )
evtStream = augStream.GetEventStream()
svcMgr += createThinningSvc( svcName="HIGG6D1ThinningSvc", outStreams=[evtStream] )
#====================================================================
# TAU SELECTOR TOOL
......@@ -225,7 +221,7 @@ ToolSvc += HIGG6D1TPThinningTool
from DerivationFrameworkMCTruth.DerivationFrameworkMCTruthConf import DerivationFramework__MenuTruthThinning
HIGG6D1TruthThinningTool = DerivationFramework__MenuTruthThinning(name = "HIGG6D1TruthThinningTool",
ThinningService = "HIGG6D1ThinningSvc",
StreamName = streamName,
WritePartons = False,
WriteHadrons = False,
WriteBHadrons = True,
......
......@@ -37,12 +37,8 @@ streamName = derivationFlags.WriteDAOD_HIGG6D2Stream.StreamName
fileName = buildFileName( derivationFlags.WriteDAOD_HIGG6D2Stream )
HIGG6D2Stream = MSMgr.NewPoolRootStream( streamName, fileName )
HIGG6D2Stream.AcceptAlgs(["HIGG6D2Kernel"])
# Special lines for thinning
# Thinning service name must match the one passed to the thinning tools
from AthenaServices.Configurables import ThinningSvc, createThinningSvc
augStream = MSMgr.GetStream( streamName )
evtStream = augStream.GetEventStream()
svcMgr += createThinningSvc( svcName="HIGG6D2ThinningSvc", outStreams=[evtStream] )
#====================================================================
# TAU SELECTOR TOOL
......@@ -225,7 +221,7 @@ ToolSvc += HIGG6D2TPThinningTool
from DerivationFrameworkMCTruth.DerivationFrameworkMCTruthConf import DerivationFramework__MenuTruthThinning
HIGG6D2TruthThinningTool = DerivationFramework__MenuTruthThinning(name = "HIGG6D2TruthThinningTool",
ThinningService = "HIGG6D2ThinningSvc",
StreamName = streamName,
WritePartons = False,
WriteHadrons = False,
WriteBHadrons = True,
......
......@@ -168,7 +168,7 @@ HIGG8D1TruthTool2 = DerivationFramework__GenericTruthThinning(name
from DerivationFrameworkMCTruth.DerivationFrameworkMCTruthConf import DerivationFramework__MenuTruthThinning
HIGG8D1TruthTool3 = DerivationFramework__MenuTruthThinning(name = "HIGG8D1TruthTool3",
ThinningService = HIGG8D1ThinningHelper.ThinningSvc(),
StreamName = streamName,
#WritePartons = True,
WritePartons = False,
WriteHadrons = False,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment