diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/python/HIGG4DxThinning.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/python/HIGG4DxThinning.py index 512b09244962001fc5d5d69c69f4e7b774e51091..ba6c1980babe6fa37f3c0de982afd07ac6d62280 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/python/HIGG4DxThinning.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/python/HIGG4DxThinning.py @@ -124,7 +124,7 @@ def setup(HIGG4DxName, streamName, HIGG4DxThinningSvc, ToolSvc): from DerivationFrameworkMCTruth.DerivationFrameworkMCTruthConf import DerivationFramework__GenericTruthThinning #thin taus HIGG4DxTruthTool_TAU = DerivationFramework__GenericTruthThinning(name = HIGG4DxName+"TruthTool_TAU", - ThinningService = HIGG4DxThinningSvc, + StreamName = streamName, ParticleSelectionString = truth_cond_tau, PreserveDescendants = False, PreserveGeneratorDescendants = True, @@ -135,7 +135,7 @@ def setup(HIGG4DxName, streamName, HIGG4DxThinningSvc, ToolSvc): #thin leptons and taus HIGG4DxTruthTool_COMB = DerivationFramework__GenericTruthThinning(name = HIGG4DxName+"TruthTool_COMB", - ThinningService = HIGG4DxThinningSvc, + StreamName = streamName, ParticleSelectionString = truth_cond_comb, PreserveDescendants = False, PreserveGeneratorDescendants = False, @@ -147,7 +147,7 @@ def setup(HIGG4DxName, streamName, HIGG4DxThinningSvc, ToolSvc): #thin photons """HIGG4DxTruthTool_PHO = DerivationFramework__GenericTruthThinning(name = "HIGG4DxTruthTool_PHO", - ThinningService = HIGG4DxThinningHelper.ThinningSvc(), + StreamName = streamName, ParticlesKey = "TruthPhotons", ParticleSelectionString = truth_photon_thinning) diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG1D1.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG1D1.py index e5a6f2336e9ffb561435e9cf0420fedc64fcf985..dcdcbfacdb80e605e92c53dc42b8b5c9ad3a497a 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG1D1.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG1D1.py @@ -27,11 +27,8 @@ HIGG1D1Stream.AcceptAlgs(["HIGG1D1Kernel"]) ## Do not use this variable at the derivation stage #HIGG1D1Stream.AddItem("std::vector<int>#leadingV") -# 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="HIGG1D1ThinningSvc", outStreams=[evtStream] ) #==================================================================== # SKIMMING TOOLS @@ -153,7 +150,7 @@ truth_expression = '('+truth_cond_1+' || '+truth_cond_2 +' || '+truth_cond_3 +' from DerivationFrameworkMCTruth.DerivationFrameworkMCTruthConf import DerivationFramework__GenericTruthThinning HIGG1D1TruthThinningTool = DerivationFramework__GenericTruthThinning(name = "HIGG1D1TruthThinningTool", - ThinningService = "HIGG1D1ThinningSvc", + StreamName = streamName, ParticleSelectionString = truth_expression, PreserveDescendants = False, PreserveGeneratorDescendants = True, diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG1D2.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG1D2.py index c8079eda6ee4e7ae1f91242e1a098e73fdc78f89..45dacb59106a3817f925493fcbc770412f4e7913 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG1D2.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG1D2.py @@ -22,11 +22,8 @@ HIGG1D2Stream = MSMgr.NewPoolRootStream( streamName, fileName ) HIGG1D2Stream.AcceptAlgs(["HIGG1D2Kernel"]) -# 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="HIGG1D2ThinningSvc", outStreams=[evtStream] ) #==================================================================== # SKIMMING TOOLS @@ -174,7 +171,7 @@ truth_expression = '('+truth_cond_1+' || '+truth_cond_2 +' || '+truth_cond_3 +' from DerivationFrameworkMCTruth.DerivationFrameworkMCTruthConf import DerivationFramework__GenericTruthThinning HIGG1D2TruthThinningTool = DerivationFramework__GenericTruthThinning(name = "HIGG1D2TruthThinningTool", - ThinningService = "HIGG1D2ThinningSvc", + StreamName = streamName, ParticleSelectionString = truth_expression, PreserveDescendants = False, PreserveGeneratorDescendants = True, diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D1.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D1.py index 791f5084f925b23837d8c94ec22292ece356578b..7a13a9977ad019c646d6450fcc4f6da82d164717 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D1.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D1.py @@ -107,7 +107,7 @@ if useGenericTruthThinning: from DerivationFrameworkMCTruth.DerivationFrameworkMCTruthConf import DerivationFramework__GenericTruthThinning HIGG2D1TruthThinningTool = DerivationFramework__GenericTruthThinning(name = "HIGG2D1TruthThinningTool", - ThinningService = HIGG2D1ThinningHelper.ThinningSvc(), + StreamName = streamName, ParticleSelectionString = truth_expression, PreserveDescendants = False, PreserveGeneratorDescendants = True, diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D2.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D2.py index 2b758e461e3350d2883da3aef3b105993ba621df..67941bb65e1fc589088040259d7c3a72b6e00d88 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D2.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D2.py @@ -97,7 +97,7 @@ if useGenericTruthThinning: from DerivationFrameworkMCTruth.DerivationFrameworkMCTruthConf import DerivationFramework__GenericTruthThinning HIGG2D2TruthThinningTool = DerivationFramework__GenericTruthThinning(name = "HIGG2D2TruthThinningTool", - ThinningService = HIGG2D2ThinningHelper.ThinningSvc(), + StreamName = streamName, ParticleSelectionString = truth_expression, PreserveDescendants = False, PreserveGeneratorDescendants = True, diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D3.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D3.py index 49860fbc2a0d8e06abb63d53da3b230ec48d9c8d..c45b8d548dcefce730ed14d88340af07bd43e880 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D3.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D3.py @@ -115,7 +115,7 @@ truth_expression = '('+truth_cond_WZH+' || '+truth_cond_Lepton +' || '+truth_con from DerivationFrameworkMCTruth.DerivationFrameworkMCTruthConf import DerivationFramework__GenericTruthThinning HIGG2D3TruthThinningTool = DerivationFramework__GenericTruthThinning(name = "HIGG2D3TruthThinningTool", - ThinningService = HIGG2D3ThinningHelper.ThinningSvc(), + StreamName = streamName, ParticleSelectionString = truth_expression, PreserveDescendants = False, PreserveGeneratorDescendants = True, diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D4.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D4.py index 02153970430bcc09361cd663d914be2310d828de..c492c1f56b35fe58673884d1707152c7c219604e 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D4.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D4.py @@ -111,7 +111,7 @@ if useGenericTruthThinning: from DerivationFrameworkMCTruth.DerivationFrameworkMCTruthConf import DerivationFramework__GenericTruthThinning HIGG2D4TruthThinningTool = DerivationFramework__GenericTruthThinning(name = "HIGG2D4TruthThinningTool", - ThinningService = HIGG2D4ThinningHelper.ThinningSvc(), + StreamName = streamName, ParticleSelectionString = truth_expression, PreserveDescendants = False, PreserveGeneratorDescendants = True, diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D5.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D5.py index 94054189ea1f41b7e3664078f392667d622113fb..87f1c77163de43a7c4fb8f673256935e950e26de 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D5.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D5.py @@ -255,7 +255,7 @@ if useGenericTruthThinning: from DerivationFrameworkMCTruth.DerivationFrameworkMCTruthConf import DerivationFramework__GenericTruthThinning HIGG2D5TruthThinningTool = DerivationFramework__GenericTruthThinning(name = "HIGG2D5TruthThinningTool", - ThinningService = HIGG2D5ThinningHelper.ThinningSvc(), + StreamName = streamName, ParticleSelectionString = truth_expression, PreserveDescendants = False, PreserveGeneratorDescendants = True, diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG3D1.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG3D1.py index 949eb7858c466c710e2b2e8184fc0a9039cdf8a7..b114a45f70cee89ae2b3837b66955946cdd3114b 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG3D1.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG3D1.py @@ -83,7 +83,7 @@ truth_expression = truth_cond1+' || '+truth_cond2 +' || '+truth_cond3 +' || '+tr from DerivationFrameworkMCTruth.DerivationFrameworkMCTruthConf import DerivationFramework__GenericTruthThinning HIGG3D1TruthThinningTool = DerivationFramework__GenericTruthThinning(name = "HIGG3D1TruthThinningTool", - ThinningService = HIGG3D1ThinningHelper.ThinningSvc(), + StreamName = streamName, ParticleSelectionString = truth_expression, PreserveDescendants = True, PreserveAncestors = True, diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG3D2.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG3D2.py index ad48aa1a488233bd0321ebe6a72fe6ea90425818..22fa456dc97655dcf37f19b8d9cc2174cbaf142f 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG3D2.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG3D2.py @@ -26,7 +26,7 @@ truth_expression = truth_cond1+' || '+truth_cond2 +' || '+truth_cond3 +' || '+tr from DerivationFrameworkMCTruth.DerivationFrameworkMCTruthConf import DerivationFramework__GenericTruthThinning HIGG3D2TruthParticlesThinningTool = DerivationFramework__GenericTruthThinning( name = "HIGG3D2TruthParticlesThinningTool", - ThinningService = "HIGG3D2ThinningSvc", + StreamName = streamName, ParticlesKey = "TruthParticles", ParticleSelectionString = truth_expression, PreserveDescendants = False, @@ -53,12 +53,9 @@ streamName = derivationFlags.WriteDAOD_HIGG3D2Stream.StreamName fileName = buildFileName( derivationFlags.WriteDAOD_HIGG3D2Stream ) HIGG3D2Stream = MSMgr.NewPoolRootStream( streamName, fileName ) HIGG3D2Stream.AcceptAlgs(["HIGG3D2Kernel"]) -# 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="HIGG3D2ThinningSvc", outStreams=[evtStream] ) #==================================================================== # Add the containers to the output stream - slimming done here diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG3D3.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG3D3.py index a53a3dd2487bec370c69da626ed5e2e4be96ecaf..c9ba20283e82462e9014f407f53f3f2101f2cdcf 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG3D3.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG3D3.py @@ -133,7 +133,7 @@ truth_expression = truth_cond1+' || '+truth_cond2 +' || '+truth_cond3 +' || '+tr from DerivationFrameworkMCTruth.DerivationFrameworkMCTruthConf import DerivationFramework__GenericTruthThinning HIGG3D3TruthThinningTool = DerivationFramework__GenericTruthThinning(name = "HIGG3D3TruthThinningTool", - ThinningService = HIGG3D3ThinningHelper.ThinningSvc(), + StreamName = streamName, ParticleSelectionString = truth_expression, PreserveDescendants = True, PreserveAncestors = True, diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D1.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D1.py index 94ce50d13babf85b4c9aeb62818822673577655a..108cfe00e3e9077e620907e12e6341fe7b9d6e21 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D1.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D1.py @@ -50,7 +50,7 @@ truth_expression = '('+truth_cond_WZH+' || '+truth_cond_Lepton +' || '+truth_con from DerivationFrameworkMCTruth.DerivationFrameworkMCTruthConf import DerivationFramework__GenericTruthThinning HIGG5D1MCThinningTool = DerivationFramework__GenericTruthThinning( name = "HIGG5D1MCThinningTool", - ThinningService = HIGG5D1ThinningHelper.ThinningSvc(), + StreamName = streamName, ParticleSelectionString = truth_expression, PreserveDescendants = False, PreserveGeneratorDescendants = True, @@ -234,10 +234,8 @@ DerivationFrameworkJob += higg5d1Seq # # Thinning -# from AthenaServices.Configurables import ThinningSvc, createThinningSvc # augStream = MSMgr.GetStream( streamName ) # evtStream = augStream.GetEventStream() -# svcMgr += createThinningSvc( svcName="HIGG5D1ThinningSvc", outStreams=[evtStream] ) #==================================================================== # Add the containers to the output stream - slimming done here diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D2.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D2.py index 03308a8e4f54b2bd3c146ca5409c80a287a2824f..fe1083fd168e041bf4d81697f795979d96f9726b 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D2.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D2.py @@ -50,7 +50,7 @@ truth_expression = '('+truth_cond_WZH+' || '+truth_cond_Lepton +' || '+truth_con from DerivationFrameworkMCTruth.DerivationFrameworkMCTruthConf import DerivationFramework__GenericTruthThinning HIGG5D2MCThinningTool = DerivationFramework__GenericTruthThinning( name = "HIGG5D2MCThinningTool", - ThinningService = HIGG5D2ThinningHelper.ThinningSvc(), + StreamName = streamName, ParticleSelectionString = truth_expression, PreserveDescendants = False, PreserveGeneratorDescendants = True, @@ -280,10 +280,8 @@ DerivationFrameworkJob += higg5d2Seq # # Thinning -# from AthenaServices.Configurables import ThinningSvc, createThinningSvc # augStream = MSMgr.GetStream( streamName ) # evtStream = augStream.GetEventStream() -# svcMgr += createThinningSvc( svcName="HIGG5D2ThinningSvc", outStreams=[evtStream] ) #==================================================================== # Add the containers to the output stream - slimming done here diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D3.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D3.py index 03d298f724db7d4b7593782d0773550299b66e90..f68b09f3824fb7c0a8d1957c199ec99b14b51a0a 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D3.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D3.py @@ -49,7 +49,7 @@ truth_expression = '('+truth_cond_WZH+' || '+truth_cond_Lepton +' || '+truth_con from DerivationFrameworkMCTruth.DerivationFrameworkMCTruthConf import DerivationFramework__GenericTruthThinning HIGG5D3MCThinningTool = DerivationFramework__GenericTruthThinning( name = "HIGG5D3MCThinningTool", - ThinningService = HIGG5D3ThinningHelper.ThinningSvc(), + StreamName = streamName, ParticleSelectionString = truth_expression, PreserveDescendants = False, PreserveGeneratorDescendants = True, @@ -350,10 +350,8 @@ DerivationFrameworkJob += higg5d3Seq # # Thinning -# from AthenaServices.Configurables import ThinningSvc, createThinningSvc # augStream = MSMgr.GetStream( streamName ) # evtStream = augStream.GetEventStream() -# svcMgr += createThinningSvc( svcName=HIGG5D3ThinningHelper.ThinningSvc(), outStreams=[evtStream] ) #==================================================================== # Add the containers to the output stream - slimming done here diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG8D1.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG8D1.py index 79d2d8ba590e814caf4adb2d6293521f904e39c0..ae5f48078d47196884d598bd8324fa9dadedbfee 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG8D1.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG8D1.py @@ -27,11 +27,8 @@ fileName = buildFileName( derivationFlags.WriteDAOD_HIGG8D1Stream ) HIGG8D1Stream = MSMgr.NewPoolRootStream( streamName, fileName ) HIGG8D1Stream.AcceptAlgs(["HIGG8D1Kernel"]) -# 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="HIGG8D1ThinningSvc", outStreams=[evtStream] ) #==================================================================== # TAU SELECTOR TOOL @@ -152,7 +149,7 @@ truth_cond_comb = "("+truth_cond_lep+"||"+truth_cond_tau+"||"+truth_photon+")" from DerivationFrameworkMCTruth.DerivationFrameworkMCTruthConf import DerivationFramework__GenericTruthThinning HIGG8D1TruthTool = DerivationFramework__GenericTruthThinning(name = "HIGG8D1TruthTool", - ThinningService = HIGG8D1ThinningHelper.ThinningSvc(), + StreamName = streamName, ParticleSelectionString = truth_cond_tau, PreserveDescendants = False, PreserveGeneratorDescendants = True, @@ -160,7 +157,7 @@ HIGG8D1TruthTool = DerivationFramework__GenericTruthThinning(name TauHandling = False) HIGG8D1TruthTool2 = DerivationFramework__GenericTruthThinning(name = "HIGG8D1TruthTool2", - ThinningService = HIGG8D1ThinningHelper.ThinningSvc(), + StreamName = streamName, ParticleSelectionString = truth_cond_comb, PreserveDescendants = True, # False PreserveGeneratorDescendants = False,