diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/share/EGAM1.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/share/EGAM1.py index bec99c9de9f2ec1a4da3b5977871214ef93c7280..57efe7216104524c98cb1a30532851fc573c9420 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/share/EGAM1.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/share/EGAM1.py @@ -205,7 +205,7 @@ thinningTools=[] # Tracks associated with Jets from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__JetTrackParticleThinning EGAM1JetLCTPThinningTool = DerivationFramework__JetTrackParticleThinning( name = "EGAM1JetLCTPThinningTool", - ThinningService = "EGAM1ThinningSvc", + StreamName = streamName, JetKey = "AntiKt4EMTopoJets", InDetTrackParticlesKey = "InDetTrackParticles", ApplyAnd = True) diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/share/EGAM6.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/share/EGAM6.py index 74a5b2e3a7ecb8a600063cb76b02b4d8a89fa337..36d71eb37e8199173b20b641494e7307eb7ee6b6 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/share/EGAM6.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/share/EGAM6.py @@ -200,7 +200,7 @@ thinningTools=[] # Tracks associated with Jets from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__JetTrackParticleThinning EGAM6JetLCTPThinningTool = DerivationFramework__JetTrackParticleThinning( name = "EGAM6JetLCTPThinningTool", - ThinningService = "EGAM6ThinningSvc", + StreamName = streamName, JetKey = "AntiKt4EMTopoJets", InDetTrackParticlesKey = "InDetTrackParticles", ApplyAnd = True) diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/share/EGAM8.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/share/EGAM8.py index 3e8c4f05794d4c69a05a269138a35350df9bd301..30d3187ee7c8a892a3db63563cba08424621a212 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/share/EGAM8.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/share/EGAM8.py @@ -134,7 +134,7 @@ thinningTools=[] # Tracks associated with Jets from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__JetTrackParticleThinning EGAM8JetLCTPThinningTool = DerivationFramework__JetTrackParticleThinning( name = "EGAM8JetLCTPThinningTool", - ThinningService = "EGAM8ThinningSvc", + StreamName = streamName, JetKey = "AntiKt4EMTopoJets", InDetTrackParticlesKey = "InDetTrackParticles", ApplyAnd = True) diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/share/EXOT11.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/share/EXOT11.py index e49f7e13b0ba2f98c93673367530854731f78850..fbe64307b07949dc2a546baf7bc2e90d34a7ea02 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/share/EXOT11.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/share/EXOT11.py @@ -64,7 +64,7 @@ thinningTools.append(EXOT11MuonTPThinningTool) #Tracks associated with Jets from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__JetTrackParticleThinning EXOT11AKt4JetTPThinningTool = DerivationFramework__JetTrackParticleThinning( name = "EXOT11AKt4JetTPThinningTool", - ThinningService = "EXOT11ThinningSvc", + StreamName = streamName, JetKey = "AntiKt4LCTopoJets", SelectionString = "AntiKt4LCTopoJets.pt > 15*GeV && abs(AntiKt4LCTopoJets.eta) < 2.8", InDetTrackParticlesKey = "InDetTrackParticles") @@ -72,7 +72,7 @@ ToolSvc += EXOT11AKt4JetTPThinningTool thinningTools.append(EXOT11AKt4JetTPThinningTool) EXOT11AKt10JetTPThinningTool = DerivationFramework__JetTrackParticleThinning( name = "EXOT11AKt10JetTPThinningTool", - ThinningService = "EXOT11ThinningSvc", + StreamName = streamName, JetKey = "AntiKt10LCTopoJets", SelectionString = "AntiKt10LCTopoJets.pt > 200*GeV && abs(AntiKt10LCTopoJets.eta) < 2.8", InDetTrackParticlesKey = "InDetTrackParticles") diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/share/EXOT12.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/share/EXOT12.py index 8fd88f0eaef850742bbfcb36dbf9fd48005af61e..db4d778d48d0d8d5773edaa1b3edf0c6e4f2256f 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/share/EXOT12.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/share/EXOT12.py @@ -64,7 +64,7 @@ thinningTools.append(EXOT12MuonTPThinningTool) #Tracks associated with Jets from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__JetTrackParticleThinning EXOT12AKt4JetTPThinningTool = DerivationFramework__JetTrackParticleThinning( name = "EXOT12AKt4JetTPThinningTool", - ThinningService = "EXOT12ThinningSvc", + StreamName = streamName, JetKey = "AntiKt4LCTopoJets", SelectionString = "AntiKt4LCTopoJets.pt > 15*GeV && abs(AntiKt4LCTopoJets.eta) < 2.8", InDetTrackParticlesKey = "InDetTrackParticles") @@ -72,7 +72,7 @@ ToolSvc += EXOT12AKt4JetTPThinningTool thinningTools.append(EXOT12AKt4JetTPThinningTool) EXOT12AKt10JetTPThinningTool = DerivationFramework__JetTrackParticleThinning( name = "EXOT12AKt10JetTPThinningTool", - ThinningService = "EXOT12ThinningSvc", + StreamName = streamName, JetKey = "AntiKt10LCTopoJets", SelectionString = "AntiKt10LCTopoJets.pt > 200*GeV && abs(AntiKt10LCTopoJets.eta) < 2.8", InDetTrackParticlesKey = "InDetTrackParticles") diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/share/EXOT16.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/share/EXOT16.py index c338c00a4f178b30a395011b9c2464bcbcd1c84d..b23138fa945e9f2cdda2d89c262f1b15e0b28841 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/share/EXOT16.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/share/EXOT16.py @@ -198,7 +198,7 @@ thinningTools=[] # Tracks associated with jets (for e-in-jet OR) from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__JetTrackParticleThinning EXOT16JetTPThinningTool = DerivationFramework__JetTrackParticleThinning( name = "EXOT16JetTPThinningTool", - ThinningService = "EXOT16ThinningSvc", + StreamName = streamName, JetKey = "AntiKt4LCTopoJets", SelectionString = "AntiKt4LCTopoJets.pt > 15*GeV && AntiKt4LCTopoJets.eta > -2.8 && AntiKt4LCTopoJets.eta < 2.8", InDetTrackParticlesKey = "InDetTrackParticles") @@ -206,7 +206,7 @@ ToolSvc += EXOT16JetTPThinningTool thinningTools.append(EXOT16JetTPThinningTool) ##EXOT16CA15JetTPThinningTool = DerivationFramework__JetTrackParticleThinning(name = "EXOT16CA15JetTPThinningTool", -## ThinningService = "EXOT16ThinningSvc", +## StreamName = streamName, ## JetKey = "CamKt15LCTopoJets", ## SelectionString = "CamKt15LCTopoJets.pt > 150*GeV && CamKt15LCTopoJets.eta > -2.7 && CamKt15LCTopoJets.eta < 2.7", ## InDetTrackParticlesKey = "InDetTrackParticles") diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/share/EXOT3.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/share/EXOT3.py index 1255b1a88a31bb1d4c081c4de7cfa77f51ecd583..9be35ec7b4f635f964398cda81513217186cd9e0 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/share/EXOT3.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/share/EXOT3.py @@ -51,7 +51,7 @@ from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFram #ToolSvc += EXOT3MetTPThinningTool # #EXOT3JetTPThinningTool = DerivationFramework__JetTrackParticleThinning( name = "EXOT3JetTPThinningTool", -# ThinningService = "EXOT3ThinningSvc", +# StreamName = streamName, # JetKey = "AntiKt4LCTopoJets", # InDetTrackParticlesKey = "InDetTrackParticles") #ToolSvc += EXOT3JetTPThinningTool @@ -94,7 +94,7 @@ thinningTools.append(EXOT3PhotonTPThinningTool) #Tracks associated with Jets from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__JetTrackParticleThinning EXOT3AKt4JetTPThinningTool = DerivationFramework__JetTrackParticleThinning( name = "EXOT3AKt4JetTPThinningTool", - ThinningService = "EXOT3ThinningSvc", + StreamName = streamName, JetKey = "AntiKt4LCTopoJets", SelectionString = "AntiKt4LCTopoJets.pt > 15*GeV && abs(AntiKt4LCTopoJets.eta) < 2.8", InDetTrackParticlesKey = "InDetTrackParticles") @@ -102,7 +102,7 @@ ToolSvc += EXOT3AKt4JetTPThinningTool thinningTools.append(EXOT3AKt4JetTPThinningTool) EXOT3AKt10JetTPThinningTool = DerivationFramework__JetTrackParticleThinning( name = "EXOT3AKt10JetTPThinningTool", - ThinningService = "EXOT3ThinningSvc", + StreamName = streamName, JetKey = "AntiKt10LCTopoJets", SelectionString = "AntiKt10LCTopoJets.pt > 150*GeV && abs(AntiKt10LCTopoJets.eta) < 2.8", InDetTrackParticlesKey = "InDetTrackParticles") @@ -110,7 +110,7 @@ ToolSvc += EXOT3AKt10JetTPThinningTool thinningTools.append(EXOT3AKt10JetTPThinningTool) EXOT3AKt10JetTPThinningTool = DerivationFramework__JetTrackParticleThinning( name = "EXOT3Cam12JetTPThinningTool", - ThinningService = "EXOT3ThinningSvc", + StreamName = streamName, JetKey = "CamKt12LCTopoJets", SelectionString = "CamKt12LCTopoJets.pt > 150*GeV && abs(CamKt12LCTopoJets.eta) < 2.8", InDetTrackParticlesKey = "InDetTrackParticles") diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/share/EXOT4.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/share/EXOT4.py index 9328121c7beeef3c8abe45f141e4fb7fa9712d6f..4f6bd57a76f2e3653c377f823ed211930f92ff07 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/share/EXOT4.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/share/EXOT4.py @@ -88,7 +88,7 @@ thinningTools=[] # Tracks associated with jets (for e-in-jet OR) from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__JetTrackParticleThinning EXOT4JetTPThinningTool = DerivationFramework__JetTrackParticleThinning( name = "EXOT4JetTPThinningTool", - ThinningService = "EXOT4ThinningSvc", + StreamName = streamName, JetKey = "AntiKt4EMTopoJets", SelectionString = "AntiKt4EMTopoJets.DFCommonJets_Calib_pt > 15*GeV && AntiKt4EMTopoJets.DFCommonJets_Calib_eta > -2.8 && AntiKt4EMTopoJets.DFCommonJets_Calib_eta < 2.8", InDetTrackParticlesKey = "InDetTrackParticles") @@ -96,7 +96,7 @@ ToolSvc += EXOT4JetTPThinningTool thinningTools.append(EXOT4JetTPThinningTool) EXOT4CA15JetTPThinningTool = DerivationFramework__JetTrackParticleThinning(name = "EXOT4CA15JetTPThinningTool", - ThinningService = "EXOT4ThinningSvc", + StreamName = streamName, JetKey = "CamKt15LCTopoJets", SelectionString = "CamKt15LCTopoJets.pt > 150*GeV && CamKt15LCTopoJets.eta > -2.7 && CamKt15LCTopoJets.eta < 2.7", InDetTrackParticlesKey = "InDetTrackParticles") diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/share/EXOT5.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/share/EXOT5.py index d018d3086579d4b5b8609bc91416f7c766897a41..077cdebe745221610bce374c3fd8997bc7ab1eaf 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/share/EXOT5.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/share/EXOT5.py @@ -83,7 +83,7 @@ thinningTools.append(EXOT5TauTPThinningTool) # Keep tracks associated with jets #EXOT5JetTPThinningTool = DerivationFramework__JetTrackParticleThinning( #name = 'EXOT5JetTPThinningTool', - #ThinningService = EXOT5ThinningHelper.ThinningSvc(), + #StreamName = streamName, #JetKey = 'AntiKt4EMTopoJets', #InDetTrackParticlesKey = 'InDetTrackParticles', #SelectionString = 'AntiKt4EMTopoJets.pt > 20*GeV') diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/share/EXOT6.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/share/EXOT6.py index 8ce0a2359235ad03dcafcf5105e42a479f4e8aa7..9e45511dccd507d6b5d4304070c06f91fab7db45 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/share/EXOT6.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/share/EXOT6.py @@ -42,7 +42,7 @@ from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFram #ToolSvc += EXOT6MetTPThinningTool # #EXOT6JetTPThinningTool = DerivationFramework__JetTrackParticleThinning( name = "EXOT6JetTPThinningTool", -# ThinningService = "EXOT6ThinningSvc", +# StreamName = streamName, # JetKey = "AntiKt4LCTopoJets", # InDetTrackParticlesKey = "InDetTrackParticles") #ToolSvc += EXOT6JetTPThinningTool diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/share/EXOT7.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/share/EXOT7.py index 1dfb8aa81140515ae36614f8ba20e6273a48bd0b..58d2f329ce050a6b66ab20ed0cf33e14de8765d4 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/share/EXOT7.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/share/EXOT7.py @@ -149,7 +149,7 @@ thinningTools=[] # Tracks associated with jets (for e-in-jet OR) from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__JetTrackParticleThinning EXOT7JetTPThinningTool = DerivationFramework__JetTrackParticleThinning(name = "EXOT7JetTPThinningTool", - ThinningService = "EXOT7ThinningSvc", + StreamName = streamName, JetKey = "AntiKt4LCTopoJets", SelectionString = "AntiKt4LCTopoJets.pt > 15*GeV && AntiKt4LCTopoJets.eta > -2.8 && AntiKt4LCTopoJets.eta < 2.8", InDetTrackParticlesKey = "InDetTrackParticles") @@ -158,7 +158,7 @@ thinningTools.append(EXOT7JetTPThinningTool) # for HTT EXOT7CA8JetTPThinningTool = DerivationFramework__JetTrackParticleThinning(name = "EXOT7CA8JetTPThinningTool", - ThinningService = "EXOT7ThinningSvc", + StreamName = streamName, JetKey = "CamKt8LCTopoJets", SelectionString = "CamKt8LCTopoJets.pt > 150*GeV && CamKt8LCTopoJets.eta > -2.7 && CamKt8LCTopoJets.eta < 2.7", InDetTrackParticlesKey = "InDetTrackParticles") @@ -166,7 +166,7 @@ ToolSvc += EXOT7CA8JetTPThinningTool thinningTools.append(EXOT7CA8JetTPThinningTool) EXOT7CA15JetTPThinningTool = DerivationFramework__JetTrackParticleThinning(name = "EXOT7CA15JetTPThinningTool", - ThinningService = "EXOT7ThinningSvc", + StreamName = streamName, JetKey = "CamKt15LCTopoJets", SelectionString = "CamKt15LCTopoJets.pt > 150*GeV && CamKt15LCTopoJets.eta > -2.7 && CamKt15LCTopoJets.eta < 2.7", InDetTrackParticlesKey = "InDetTrackParticles") @@ -174,7 +174,7 @@ ToolSvc += EXOT7CA15JetTPThinningTool thinningTools.append(EXOT7CA15JetTPThinningTool) EXOT7Ak10JetTPThinningTool = DerivationFramework__JetTrackParticleThinning(name = "EXOT7Ak10JetTPThinningTool", - ThinningService = "EXOT7ThinningSvc", + StreamName = streamName, JetKey = "AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets", SelectionString = "AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets.pt > 150*GeV && AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets.eta > -2.7 && AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets.eta < 2.7", InDetTrackParticlesKey = "InDetTrackParticles") diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/share/EXOT8.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/share/EXOT8.py index 0e99f53fcf99f294b9fdd02aeb4e703166e06394..6c832b95d42f551ee34fbfe22896ea6d6c058082 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/share/EXOT8.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/share/EXOT8.py @@ -65,7 +65,7 @@ thinningTools.append(EXOT8ElectronTPThinningTool) ######################################### from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__JetTrackParticleThinning EXOT8Ak4JetTPThinningTool = DerivationFramework__JetTrackParticleThinning(name = "EXOT8Ak4JetTPThinningTool", - ThinningService = "EXOT8ThinningSvc", + StreamName = streamName, JetKey = "AntiKt4LCTopoJets", SelectionString = "AntiKt4LCTopoJets.pt > 50*GeV && AntiKt4LCTopoJets.eta > -2.7 && AntiKt4LCTopoJets.eta < 2.7", InDetTrackParticlesKey = "InDetTrackParticles") @@ -76,7 +76,7 @@ thinningTools.append(EXOT8Ak4JetTPThinningTool) # Tracks associated with large-R jets (0.2) ############################################ EXOT8Ak10r2JetTPThinningTool = DerivationFramework__JetTrackParticleThinning(name = "EXOT8Ak10r2JetTPThinningTool", - ThinningService = "EXOT8ThinningSvc", + StreamName = streamName, JetKey = "AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets", SelectionString = "AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets.DFCommonJets_Calib_pt > 200*GeV && AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets.DFCommonJets_Calib_eta > -2.7 && AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets.DFCommonJets_Calib_eta < 2.7", InDetTrackParticlesKey = "InDetTrackParticles") diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/python/HIGG4DxThinning.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/python/HIGG4DxThinning.py index 8361e0fe189458fa344cbd2679e265f3c669f7d9..512b09244962001fc5d5d69c69f4e7b774e51091 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/python/HIGG4DxThinning.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/python/HIGG4DxThinning.py @@ -29,7 +29,7 @@ def setup(HIGG4DxName, streamName, HIGG4DxThinningSvc, ToolSvc): #jets and tracks from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__JetTrackParticleThinning HIGG4DxJetTPThinningTool = DerivationFramework__JetTrackParticleThinning( name = HIGG4DxName+"JetTPThinningTool", - ThinningService = HIGG4DxThinningSvc, + StreamName = streamName, JetKey = "AntiKt4EMTopoJets", SelectionString = "AntiKt4EMTopoJets.pt > 18*GeV", InDetTrackParticlesKey = "InDetTrackParticles", @@ -38,7 +38,7 @@ def setup(HIGG4DxName, streamName, HIGG4DxThinningSvc, ToolSvc): thinningTools.append(HIGG4DxJetTPThinningTool) HIGG4DxJetLCTPThinningTool = DerivationFramework__JetTrackParticleThinning( name = HIGG4DxName+"JetLCTPThinningTool", - ThinningService = HIGG4DxThinningSvc, + StreamName = streamName, JetKey = "AntiKt4LCTopoJets", SelectionString = "AntiKt4LCTopoJets.pt > 18*GeV", InDetTrackParticlesKey = "InDetTrackParticles", @@ -50,7 +50,7 @@ def setup(HIGG4DxName, streamName, HIGG4DxThinningSvc, ToolSvc): if HIGG4DxName in ['HIGG4D2', 'HIGG4D3']: from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__JetTrackParticleThinning HIGG4DxJetTrackThinningTool1 = DerivationFramework__JetTrackParticleThinning( name = HIGG4DxName+"JetTrackThinningTool1", - ThinningService = HIGG4DxThinningSvc, + StreamName = streamName, JetKey = "AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets", SelectionString = "AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets.pt > 150*GeV", InDetTrackParticlesKey = "InDetTrackParticles", @@ -61,7 +61,7 @@ def setup(HIGG4DxName, streamName, HIGG4DxThinningSvc, ToolSvc): if HIGG4DxName in ['HIGG4D2', 'HIGG4D3']: from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__JetTrackParticleThinning HIGG4DxJetTrackThinningTool2 = DerivationFramework__JetTrackParticleThinning( name = HIGG4DxName+"JetTrackThinningTool2", - ThinningService = HIGG4DxThinningSvc, + StreamName = streamName, JetKey = "AntiKt2PV0TrackJets", SelectionString = "AntiKt2PV0TrackJets.pt > 6*GeV", InDetTrackParticlesKey = "InDetTrackParticles", diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG1D1.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG1D1.py index cc6b0c6d8c7e20b46d7a8e84f13e6a5abd8e5c5d..e5a6f2336e9ffb561435e9cf0420fedc64fcf985 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG1D1.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG1D1.py @@ -82,32 +82,23 @@ print SkimmingToolHIGG1D1 thinningTools=[] # MET/Jet tracks thinning_expression = "(InDetTrackParticles.pt > 0.5*GeV) && (InDetTrackParticles.numberOfPixelHits > 0) && (InDetTrackParticles.numberOfSCTHits > 5) && (abs(DFCommonInDetTrackZ0AtPV) < 1.5)" -from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__TrackParticleThinning -HIGG1D1MetTPThinningTool = DerivationFramework__TrackParticleThinning( name = "HIGG1D1MetTPThinningTool", - ThinningService = "HIGG1D1ThinningSvc", - SelectionString = thinning_expression, - InDetTrackParticlesKey = "InDetTrackParticles", - ApplyAnd = True) -ToolSvc += HIGG1D1MetTPThinningTool -print HIGG1D1MetTPThinningTool -#thinningTools.append(HIGG1D1MetTPThinningTool) from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__JetTrackParticleThinning HIGG1D1JetLCTPThinningTool = DerivationFramework__JetTrackParticleThinning( name = "HIGG1D1JetLCTPThinningTool", - ThinningService = "HIGG1D1ThinningSvc", + StreamName = streamName, JetKey = "AntiKt4LCTopoJets", InDetTrackParticlesKey = "InDetTrackParticles", - ApplyAnd = True) + TrackSelectionString = thinning_expression) ToolSvc += HIGG1D1JetLCTPThinningTool print HIGG1D1JetLCTPThinningTool #thinningTools.append(HIGG1D1JetLCTPThinningTool) from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__JetTrackParticleThinning HIGG1D1JetEMTPThinningTool = DerivationFramework__JetTrackParticleThinning( name = "HIGG1D1JetEMTPThinningTool", - ThinningService = "HIGG1D1ThinningSvc", + StreamName = streamName, JetKey = "AntiKt4EMTopoJets", InDetTrackParticlesKey = "InDetTrackParticles", - ApplyAnd = True) + TrackSelectionString = thinning_expression) ToolSvc += HIGG1D1JetEMTPThinningTool print HIGG1D1JetEMTPThinningTool #thinningTools.append(HIGG1D1JetEMTPThinningTool) @@ -143,8 +134,9 @@ print HIGG1D1PhotonTPThinningTool #thinningTools.append(HIGG1D1PhotonTPThinningTool) # Tracks themselves +from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__TrackParticleThinning HIGG1D1TPThinningTool = DerivationFramework__TrackParticleThinning( name = "HIGG1D1TPThinningTool", - ThinningService = "HIGG1D1ThinningSvc", + StreamName = streamName, SelectionString = "abs( DFCommonInDetTrackZ0AtPV * sin(InDetTrackParticles.theta)) < 3.0", InDetTrackParticlesKey = "InDetTrackParticles") ToolSvc += HIGG1D1TPThinningTool diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG1D2.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG1D2.py index a6b60fea6e9377d2d0b9bf2591b77315814345a2..c8079eda6ee4e7ae1f91242e1a098e73fdc78f89 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG1D2.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG1D2.py @@ -101,32 +101,23 @@ print "HIGG1D2 skimming tool:", HIGG1D2SkimmingTool thinningTools=[] # MET/Jet tracks thinning_expression = "(InDetTrackParticles.pt > 0.5*GeV) && (InDetTrackParticles.numberOfPixelHits > 0) && (InDetTrackParticles.numberOfSCTHits > 5) && (abs(DFCommonInDetTrackZ0AtPV) < 1.5)" -from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__TrackParticleThinning -HIGG1D2MetTPThinningTool = DerivationFramework__TrackParticleThinning( name = "HIGG1D2MetTPThinningTool", - ThinningService = "HIGG1D2ThinningSvc", - SelectionString = thinning_expression, - InDetTrackParticlesKey = "InDetTrackParticles", - ApplyAnd = True) -ToolSvc += HIGG1D2MetTPThinningTool -print HIGG1D2MetTPThinningTool -#thinningTools.append(HIGG1D2MetTPThinningTool) from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__JetTrackParticleThinning HIGG1D2JetLCTPThinningTool = DerivationFramework__JetTrackParticleThinning( name = "HIGG1D2JetLCTPThinningTool", - ThinningService = "HIGG1D2ThinningSvc", + StreamName = streamName, JetKey = "AntiKt4LCTopoJets", InDetTrackParticlesKey = "InDetTrackParticles", - ApplyAnd = True) + TrackSelectionString = thinning_expression) ToolSvc += HIGG1D2JetLCTPThinningTool print HIGG1D2JetLCTPThinningTool #thinningTools.append(HIGG1D2JetLCTPThinningTool) from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__JetTrackParticleThinning HIGG1D2JetEMTPThinningTool = DerivationFramework__JetTrackParticleThinning( name = "HIGG1D2JetEMTPThinningTool", - ThinningService = "HIGG1D2ThinningSvc", + StreamName = streamName, JetKey = "AntiKt4EMTopoJets", InDetTrackParticlesKey = "InDetTrackParticles", - ApplyAnd = True) + TrackSelectionString = thinning_expression) ToolSvc += HIGG1D2JetEMTPThinningTool print HIGG1D2JetEMTPThinningTool #thinningTools.append(HIGG1D2JetEMTPThinningTool) @@ -162,8 +153,9 @@ print HIGG1D2PhotonTPThinningTool #thinningTools.append(HIGG1D2PhotonTPThinningTool) # Tracks themselves +from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__TrackParticleThinning HIGG1D2TPThinningTool = DerivationFramework__TrackParticleThinning( name = "HIGG1D2TPThinningTool", - ThinningService = "HIGG1D2ThinningSvc", + StreamName = streamName, SelectionString = "abs( DFCommonInDetTrackZ0AtPV * sin(InDetTrackParticles.theta)) < 3.0", InDetTrackParticlesKey = "InDetTrackParticles") ToolSvc += HIGG1D2TPThinningTool diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D1.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D1.py index 633449a78f99f703489e18c600826c11eaf24c34..791f5084f925b23837d8c94ec22292ece356578b 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D1.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D1.py @@ -36,21 +36,13 @@ HIGG2D1ThinningHelper.AppendToStream(HIGG2D1Stream) # MET/Jet tracks thinning_expression = "(InDetTrackParticles.pt > 0.5*GeV) && (InDetTrackParticles.numberOfPixelHits > 0) && (InDetTrackParticles.numberOfSCTHits > 5) && (abs(DFCommonInDetTrackZ0AtPV) < 1.5)" -from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__TrackParticleThinning -HIGG2D1TPThinningTool = DerivationFramework__TrackParticleThinning(name = "HIGG2D1TPThinningTool", - ThinningService = HIGG2D1ThinningHelper.ThinningSvc(), - SelectionString = thinning_expression, - InDetTrackParticlesKey = "InDetTrackParticles", - ApplyAnd = True) -ToolSvc += HIGG2D1TPThinningTool -thinningTools.append(HIGG2D1TPThinningTool) from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__JetTrackParticleThinning HIGG2D1JetTPThinningTool = DerivationFramework__JetTrackParticleThinning(name = "HIGG2D1JetTPThinningTool", - ThinningService = HIGG2D1ThinningHelper.ThinningSvc(), + StreamName = streamName, JetKey = "AntiKt4LCTopoJets", InDetTrackParticlesKey = "InDetTrackParticles", - ApplyAnd = True) + TrackSelectionString = thinning_expression) ToolSvc += HIGG2D1JetTPThinningTool thinningTools.append(HIGG2D1JetTPThinningTool) diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D2.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D2.py index 519bb343b056a80b4b49e857c358ca93ef175543..2b758e461e3350d2883da3aef3b105993ba621df 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D2.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D2.py @@ -36,21 +36,13 @@ HIGG2D2ThinningHelper.AppendToStream(HIGG2D2Stream) # MET/Jet tracks thinning_expression = "(InDetTrackParticles.pt > 0.5*GeV) && (InDetTrackParticles.numberOfPixelHits > 0) && (InDetTrackParticles.numberOfSCTHits > 5) && (abs(DFCommonInDetTrackZ0AtPV) < 1.5)" -from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__TrackParticleThinning -HIGG2D2TPThinningTool = DerivationFramework__TrackParticleThinning(name = "HIGG2D2TPThinningTool", - ThinningService = HIGG2D2ThinningHelper.ThinningSvc(), - SelectionString = thinning_expression, - InDetTrackParticlesKey = "InDetTrackParticles", - ApplyAnd = True) -ToolSvc += HIGG2D2TPThinningTool -thinningTools.append(HIGG2D2TPThinningTool) from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__JetTrackParticleThinning HIGG2D2JetTPThinningTool = DerivationFramework__JetTrackParticleThinning(name = "HIGG2D2JetTPThinningTool", - ThinningService = HIGG2D2ThinningHelper.ThinningSvc(), + StreamName = streamName, JetKey = "AntiKt4LCTopoJets", InDetTrackParticlesKey = "InDetTrackParticles", - ApplyAnd = True) + TrackSelectionString = thinning_expression) ToolSvc += HIGG2D2JetTPThinningTool thinningTools.append(HIGG2D2JetTPThinningTool) diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D3.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D3.py index 4d01c146ee5cb8d50af341332646b6f12097b7b8..49860fbc2a0d8e06abb63d53da3b230ec48d9c8d 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D3.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D3.py @@ -36,21 +36,13 @@ HIGG2D3ThinningHelper.AppendToStream(HIGG2D3Stream) # MET/Jet tracks thinning_expression = "(InDetTrackParticles.pt > 0.5*GeV) && (InDetTrackParticles.numberOfPixelHits > 0) && (InDetTrackParticles.numberOfSCTHits > 5) && (abs(DFCommonInDetTrackZ0AtPV) < 1.5)" -from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__TrackParticleThinning -HIGG2D3TPThinningTool = DerivationFramework__TrackParticleThinning(name = "HIGG2D3TPThinningTool", - ThinningService = HIGG2D3ThinningHelper.ThinningSvc(), - SelectionString = thinning_expression, - InDetTrackParticlesKey = "InDetTrackParticles", - ApplyAnd = True) -ToolSvc += HIGG2D3TPThinningTool -thinningTools.append(HIGG2D3TPThinningTool) from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__JetTrackParticleThinning HIGG2D3JetTPThinningTool = DerivationFramework__JetTrackParticleThinning(name = "HIGG2D3JetTPThinningTool", - ThinningService = HIGG2D3ThinningHelper.ThinningSvc(), + StreamName = streamName, JetKey = "AntiKt4LCTopoJets", InDetTrackParticlesKey = "InDetTrackParticles", - ApplyAnd = True) + TrackSelectionString = thinning_expression) ToolSvc += HIGG2D3JetTPThinningTool thinningTools.append(HIGG2D3JetTPThinningTool) diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D4.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D4.py index b7fb060b9133b15b9cf370100f1d66dc641ff1ba..6b70cd7b360a5c8e86c041b7205a8ad4431d64a7 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D4.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D4.py @@ -38,7 +38,7 @@ HIGG2D4ThinningHelper.AppendToStream(HIGG2D4Stream) # thinning_expression = "(InDetTrackParticles.pt > 0.5*GeV) && (InDetTrackParticles.numberOfPixelHits > 0) && (InDetTrackParticles.numberOfSCTHits > 5) && (abs(DFCommonInDetTrackZ0AtPV) < 1.5)" # from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__TrackParticleThinning # HIGG2D4TPThinningTool = DerivationFramework__TrackParticleThinning(name = "HIGG2D4TPThinningTool", -# ThinningService = HIGG2D4ThinningHelper.ThinningSvc(), +# StreamName = streamName, # SelectionString = thinning_expression, # InDetTrackParticlesKey = "InDetTrackParticles", # ApplyAnd = True) @@ -48,14 +48,14 @@ HIGG2D4ThinningHelper.AppendToStream(HIGG2D4Stream) from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__JetTrackParticleThinning HIGG2D4JetTPThinningTool = DerivationFramework__JetTrackParticleThinning(name = "HIGG2D4JetTPThinningTool", - ThinningService = HIGG2D4ThinningHelper.ThinningSvc(), + StreamName = streamName, JetKey = "AntiKt4LCTopoJets", InDetTrackParticlesKey = "InDetTrackParticles") ToolSvc += HIGG2D4JetTPThinningTool thinningTools.append(HIGG2D4JetTPThinningTool) HIGG2D4JetTPThinningTool2 = DerivationFramework__JetTrackParticleThinning(name = "HIGG2D4JetTPThinningTool2", - ThinningService = HIGG2D4ThinningHelper.ThinningSvc(), + StreamName = streamName, JetKey = "AntiKt4EMTopoJets", InDetTrackParticlesKey = "InDetTrackParticles") ToolSvc += HIGG2D4JetTPThinningTool2 diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D5.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D5.py index 3c475645b20bf25e4ddcbff1aece130817b0a511..94054189ea1f41b7e3664078f392667d622113fb 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D5.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D5.py @@ -194,21 +194,13 @@ HIGG2D5ThinningHelper.AppendToStream(HIGG2D5Stream) # MET/Jet tracks thinning_expression = "(InDetTrackParticles.pt > 0.5*GeV) && (InDetTrackParticles.numberOfPixelHits > 0) && (InDetTrackParticles.numberOfSCTHits > 5) && (abs(DFCommonInDetTrackZ0AtPV) < 1.5)" -from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__TrackParticleThinning -HIGG2D5TPThinningTool = DerivationFramework__TrackParticleThinning(name = "HIGG2D5TPThinningTool", - ThinningService = HIGG2D5ThinningHelper.ThinningSvc(), - SelectionString = thinning_expression, - InDetTrackParticlesKey = "InDetTrackParticles", - ApplyAnd = True) -ToolSvc += HIGG2D5TPThinningTool -thinningTools.append(HIGG2D5TPThinningTool) from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__JetTrackParticleThinning HIGG2D5JetTPThinningTool = DerivationFramework__JetTrackParticleThinning(name = "HIGG2D5JetTPThinningTool", - ThinningService = HIGG2D5ThinningHelper.ThinningSvc(), + StreamName = streamName, JetKey = "AntiKt4LCTopoJets", InDetTrackParticlesKey = "InDetTrackParticles", - ApplyAnd = True) + TrackSelectionString = thinning_expression) ToolSvc += HIGG2D5JetTPThinningTool thinningTools.append(HIGG2D5JetTPThinningTool) diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG3D1.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG3D1.py index 02912bed3db0337b04d852acf76c50b0e4245ff3..1ec0b99a02905fa3257cca0c633c08d04502ae74 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG3D1.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG3D1.py @@ -35,21 +35,13 @@ thinningTools=[] # MET/Jet tracks thinning_expression = "(InDetTrackParticles.pt > 0.5*GeV) && (InDetTrackParticles.numberOfPixelHits > 0) && (InDetTrackParticles.numberOfSCTHits > 5) && (abs(DFCommonInDetTrackZ0AtPV) < 1.5)" -from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__TrackParticleThinning -HIGG3D1MetTPThinningTool = DerivationFramework__TrackParticleThinning(name = "HIGG3D1MetTPThinningTool", - ThinningService = HIGG3D1ThinningHelper.ThinningSvc(), - SelectionString = thinning_expression, - InDetTrackParticlesKey = "InDetTrackParticles", - ApplyAnd = True) -ToolSvc += HIGG3D1MetTPThinningTool -thinningTools.append(HIGG3D1MetTPThinningTool) from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__JetTrackParticleThinning HIGG3D1JetTPThinningTool = DerivationFramework__JetTrackParticleThinning( name = "HIGG3D1JetTPThinningTool", - ThinningService = HIGG3D1ThinningHelper.ThinningSvc(), + StreamName = streamName, JetKey = "AntiKt4EMTopoJets", InDetTrackParticlesKey = "InDetTrackParticles", - ApplyAnd = True) + TrackSelectionString = thinning_expression) ToolSvc += HIGG3D1JetTPThinningTool thinningTools.append(HIGG3D1JetTPThinningTool) @@ -73,6 +65,7 @@ ToolSvc += HIGG3D1ElectronTPThinningTool thinningTools.append(HIGG3D1ElectronTPThinningTool) # Tracks themselves +from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__TrackParticleThinning HIGG3D1TPThinningTool = DerivationFramework__TrackParticleThinning(name = "HIGG3D1TPThinningTool", ThinningService = HIGG3D1ThinningHelper.ThinningSvc(), SelectionString = "abs( DFCommonInDetTrackZ0AtPV * sin(InDetTrackParticles.theta)) < 3.0", diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG3D3.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG3D3.py index a612b41ad973adb5dcf1c829f869d2cd05e36cde..a53a3dd2487bec370c69da626ed5e2e4be96ecaf 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG3D3.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG3D3.py @@ -98,10 +98,9 @@ thinningTools=[] # MET/Jet tracks from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__JetTrackParticleThinning HIGG3D3JetTPThinningTool = DerivationFramework__JetTrackParticleThinning( name = "HIGG3D3JetTPThinningTool", - ThinningService = HIGG3D3ThinningHelper.ThinningSvc(), + StreamName = streamName, JetKey = "AntiKt4EMTopoJets", - InDetTrackParticlesKey = "InDetTrackParticles", - ApplyAnd = True) + InDetTrackParticlesKey = "InDetTrackParticles") ToolSvc += HIGG3D3JetTPThinningTool thinningTools.append(HIGG3D3JetTPThinningTool) diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D1.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D1.py index a12c6843f6512af78f4ce6c7b6171c3f91f500b8..dd74212d2878093f01e3a8bdb06d5ca0b08ed193 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D1.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D1.py @@ -73,7 +73,7 @@ if globalflags.DataSource()=='geant4': from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__JetTrackParticleThinning HIGG5D1JetTPThinningTool = DerivationFramework__JetTrackParticleThinning( name = "HIGG5D1JetTPThinningTool", - ThinningService = HIGG5D1ThinningHelper.ThinningSvc(), + StreamName = streamName, JetKey = "AntiKt4EMTopoJets", InDetTrackParticlesKey = "InDetTrackParticles") ToolSvc += HIGG5D1JetTPThinningTool diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D2.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D2.py index 458878c747745c16574627e13b78ba99cbb2a480..edc8785d1c581c8f3c6a050d36da93a9ea9e2daf 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D2.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D2.py @@ -73,7 +73,7 @@ if globalflags.DataSource()=='geant4': from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__JetTrackParticleThinning HIGG5D2JetTPThinningTool = DerivationFramework__JetTrackParticleThinning( name = "HIGG5D2JetTPThinningTool", - ThinningService = HIGG5D2ThinningHelper.ThinningSvc(), + StreamName = streamName, JetKey = "AntiKt4EMTopoJets", InDetTrackParticlesKey = "InDetTrackParticles") ToolSvc += HIGG5D2JetTPThinningTool diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D3.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D3.py index 01627ac9cacfa5c0d402b19c4adc6bec8e6a8515..03d298f724db7d4b7593782d0773550299b66e90 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D3.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D3.py @@ -62,10 +62,9 @@ if (is_MC) : # MET/Jet tracks from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__JetTrackParticleThinning HIGG5D3JetTPThinningTool = DerivationFramework__JetTrackParticleThinning( name = "HIGG5D3JetTPThinningTool", - ThinningService = HIGG5D3ThinningHelper.ThinningSvc(), + StreamName = streamName, JetKey = "AntiKt4EMTopoJets", - InDetTrackParticlesKey = "InDetTrackParticles", - ApplyAnd = True) + InDetTrackParticlesKey = "InDetTrackParticles") ToolSvc += HIGG5D3JetTPThinningTool thinningTools.append(HIGG5D3JetTPThinningTool) diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG6D1.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG6D1.py index db44f33818851ad766e10d3f50bd98a97abf8ba9..9413e9f57ba4597d6206250a5d88e74659bfc144 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG6D1.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG6D1.py @@ -150,25 +150,16 @@ thinningTools=[] # GenericTrackParticleThinning #==================================================================== thinning_expression = "(InDetTrackParticles.pt > 0.5*GeV) && (InDetTrackParticles.numberOfPixelHits > 0) && (InDetTrackParticles.numberOfSCTHits > 5) && (abs(DFCommonInDetTrackZ0AtPV) < 1.5)" -from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__TrackParticleThinning -HIGG6D1GenTPThinningTool = DerivationFramework__TrackParticleThinning(name = "HIGG6D1GenTPThinningTool", - ThinningService = "HIGG6D1ThinningSvc", - SelectionString = thinning_expression, - InDetTrackParticlesKey = "InDetTrackParticles", - ApplyAnd = True) -thinningTools.append(HIGG6D1GenTPThinningTool) -ToolSvc += HIGG6D1GenTPThinningTool - #==================================================================== # JetTrackParticleThinning #==================================================================== from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__JetTrackParticleThinning HIGG6D1JetTPThinningTool = DerivationFramework__JetTrackParticleThinning(name = "HIGG6D1JetTPThinningTool", - ThinningService = "HIGG6D1ThinningSvc", + StreamName = streamName, JetKey = "AntiKt4EMTopoJets", InDetTrackParticlesKey = "InDetTrackParticles", - ApplyAnd = True) + TrackSelectionString = thinning_expression) thinningTools.append(HIGG6D1JetTPThinningTool) @@ -219,6 +210,7 @@ ToolSvc += HIGG6D1ElectronTPThinningTool #==================================================================== # Tracks themselves #==================================================================== +from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__TrackParticleThinning HIGG6D1TPThinningTool = DerivationFramework__TrackParticleThinning(name = "HIGG6D1TPThinningTool", ThinningService = "HIGG6D1ThinningSvc", SelectionString = "abs( DFCommonInDetTrackZ0AtPV * sin(InDetTrackParticles.theta)) < 3.0", diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG6D2.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG6D2.py index e26532eca39188fa2a2e45ef176d88add364b163..28c5cbaa561b591ef30528d308aa68ca886e890d 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG6D2.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG6D2.py @@ -148,24 +148,17 @@ thinningTools=[] # GenericTrackParticleThinning #==================================================================== thinning_expression = "(InDetTrackParticles.pt > 0.5*GeV) && (InDetTrackParticles.numberOfPixelHits > 0) && (InDetTrackParticles.numberOfSCTHits > 5) && (abs(DFCommonInDetTrackZ0AtPV) < 1.5)" -from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__TrackParticleThinning -HIGG6D2GenTPThinningTool = DerivationFramework__TrackParticleThinning(name = "HIGG6D2GenTPThinningTool", - ThinningService = "HIGG6D2ThinningSvc", - SelectionString = thinning_expression, - InDetTrackParticlesKey = "InDetTrackParticles", - ApplyAnd = True) -thinningTools.append(HIGG6D2GenTPThinningTool) -ToolSvc += HIGG6D2GenTPThinningTool + #==================================================================== # JetTrackParticleThinning #==================================================================== from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__JetTrackParticleThinning HIGG6D2JetTPThinningTool = DerivationFramework__JetTrackParticleThinning(name = "HIGG6D2JetTPThinningTool", - ThinningService = "HIGG6D2ThinningSvc", + StreamName = streamName, JetKey = "AntiKt4EMTopoJets", InDetTrackParticlesKey = "InDetTrackParticles", - ApplyAnd = True) + TrackSelectionString = thinning_expression) thinningTools.append(HIGG6D2JetTPThinningTool) @@ -217,6 +210,7 @@ ToolSvc += HIGG6D2ElectronTPThinningTool #==================================================================== # Tracks themselves #==================================================================== +from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__TrackParticleThinning HIGG6D2TPThinningTool = DerivationFramework__TrackParticleThinning(name = "HIGG6D2TPThinningTool", ThinningService = "HIGG6D2ThinningSvc", SelectionString = "abs( DFCommonInDetTrackZ0AtPV * sin(InDetTrackParticles.theta)) < 3.0", diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG8D1.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG8D1.py index b8814f4551bc59c45623d863ade198602ad90986..79d2d8ba590e814caf4adb2d6293521f904e39c0 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG8D1.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG8D1.py @@ -84,22 +84,14 @@ HIGG8D1ThinningHelper.AppendToStream( HIGG8D1Stream ) # MET/Jet tracks thinning_expression = "(InDetTrackParticles.pt > 0.5*GeV) && (InDetTrackParticles.numberOfPixelHits > 0) && (InDetTrackParticles.numberOfSCTHits > 5) && (abs(DFCommonInDetTrackZ0AtPV) < 1.5)" -from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__TrackParticleThinning -HIGG8D1MetTPThinningTool = DerivationFramework__TrackParticleThinning(name = "HIGG8D1MetTPThinningTool", - ThinningService = HIGG8D1ThinningHelper.ThinningSvc(), #"HIGG8D1ThinningSvc - SelectionString = thinning_expression, - InDetTrackParticlesKey = "InDetTrackParticles", - ApplyAnd = True) -ToolSvc += HIGG8D1MetTPThinningTool -thinningTools.append(HIGG8D1MetTPThinningTool) from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__JetTrackParticleThinning HIGG8D1JetTPThinningTool = DerivationFramework__JetTrackParticleThinning( name = "HIGG8D1JetTPThinningTool", - ThinningService = HIGG8D1ThinningHelper.ThinningSvc(), + StreamName = streamName, JetKey = "AntiKt4EMTopoJets", InDetTrackParticlesKey = "InDetTrackParticles", - ApplyAnd = True) + TrackSelectionString = thinning_expression) ToolSvc += HIGG8D1JetTPThinningTool thinningTools.append(HIGG8D1JetTPThinningTool) diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/DerivationFrameworkInDet/JetTrackParticleThinning.h b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/DerivationFrameworkInDet/JetTrackParticleThinning.h index 0a0226a5c983d6632995b78c784d5055040e95ff..ec4b428acca0af95f7236d574fbbc154af2e1443 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/DerivationFrameworkInDet/JetTrackParticleThinning.h +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/DerivationFrameworkInDet/JetTrackParticleThinning.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration */ /////////////////////////////////////////////////////////////////// @@ -10,33 +10,41 @@ #define DERIVATIONFRAMEWORK_JETTRACKPARTICLETHINNING_H #include +#include #include "AthenaBaseComps/AthAlgTool.h" #include "DerivationFrameworkInterfaces/IThinningTool.h" #include "GaudiKernel/ToolHandle.h" +#include "xAODTracking/TrackParticleContainer.h" +#include "StoreGate/ThinningHandleKey.h" namespace ExpressionParsing { class ExpressionParser; } -class IThinningSvc; - namespace DerivationFramework { - class JetTrackParticleThinning : public AthAlgTool, public IThinningTool { + class JetTrackParticleThinning : public extends { public: JetTrackParticleThinning(const std::string& t, const std::string& n, const IInterface* p); - ~JetTrackParticleThinning(); - StatusCode initialize(); - StatusCode finalize(); - virtual StatusCode doThinning() const; + virtual ~JetTrackParticleThinning(); + virtual StatusCode initialize() override; + virtual StatusCode finalize() override; + virtual StatusCode doThinning() const override; private: - ServiceHandle m_thinningSvc; - mutable unsigned int m_ntot, m_npass; - std::string m_jetSGKey, m_inDetSGKey, m_selectionString; - bool m_and; - ExpressionParsing::ExpressionParser *m_parser; + mutable std::atomic m_ntot, m_npass; + std::string m_jetSGKey; + StringProperty m_streamName + { this, "StreamName", "", "Name of the stream being thinned" }; + SG::ThinningHandleKey m_inDetSGKey + { this, "InDetTrackParticlesKey", "InDetTrackParticles", "" }; + StringProperty m_selectionString + { this, "SelectionString", "", "" }; + StringProperty m_trackSelectionString + { this, "TrackSelectionString", "", "" }; + std::unique_ptr m_parser; + std::unique_ptr m_trackParser; }; } diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/src/JetTrackParticleThinning.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/src/JetTrackParticleThinning.cxx index aae2743c9ea85c8503876f3f4aefdb470f524132..d04b0fe7788732511a641e554200ce57cdd4968c 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/src/JetTrackParticleThinning.cxx +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/src/JetTrackParticleThinning.cxx @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration */ ///////////////////////////////////////////////////////////////// @@ -10,13 +10,14 @@ // which removes all ID tracks which do not pass a user-defined cut #include "DerivationFrameworkInDet/JetTrackParticleThinning.h" -#include "AthenaKernel/IThinningSvc.h" #include "ExpressionEvaluation/ExpressionParser.h" #include "ExpressionEvaluation/SGxAODProxyLoader.h" #include "ExpressionEvaluation/SGNTUPProxyLoader.h" #include "ExpressionEvaluation/MultipleProxyLoader.h" #include "xAODJet/JetContainer.h" #include "xAODTracking/TrackParticleContainer.h" +#include "StoreGate/ThinningHandle.h" +#include "GaudiKernel/ThreadLocalContext.h" #include #include @@ -24,22 +25,12 @@ DerivationFramework::JetTrackParticleThinning::JetTrackParticleThinning(const std::string& t, const std::string& n, const IInterface* p ) : -AthAlgTool(t,n,p), -m_thinningSvc("ThinningSvc",n), +base_class(t,n,p), m_ntot(0), m_npass(0), -m_jetSGKey(""), -m_inDetSGKey("InDetTrackParticles"), -m_selectionString(""), -m_and(false), -m_parser(0) +m_jetSGKey("") { - declareInterface(this); - declareProperty("ThinningService", m_thinningSvc); declareProperty("JetKey", m_jetSGKey); - declareProperty("InDetTrackParticlesKey", m_inDetSGKey); - declareProperty("SelectionString", m_selectionString); - declareProperty("ApplyAnd", m_and); } // Destructor @@ -51,10 +42,8 @@ StatusCode DerivationFramework::JetTrackParticleThinning::initialize() { // Decide which collections need to be checked for ID TrackParticles ATH_MSG_VERBOSE("initialize() ..."); - if (m_inDetSGKey=="") { - ATH_MSG_FATAL("No inner detector track collection provided for thinning."); - return StatusCode::FAILURE; - } else {ATH_MSG_INFO("Using " << m_inDetSGKey << "as the source collection for inner detector track particles");} + ATH_CHECK( m_inDetSGKey.initialize (m_streamName) ); + ATH_MSG_INFO("Using " << m_inDetSGKey << "as the source collection for inner detector track particles"); if (m_jetSGKey=="") { ATH_MSG_FATAL("No jet collection provided for thinning."); return StatusCode::FAILURE; @@ -65,9 +54,17 @@ StatusCode DerivationFramework::JetTrackParticleThinning::initialize() ExpressionParsing::MultipleProxyLoader *proxyLoaders = new ExpressionParsing::MultipleProxyLoader(); proxyLoaders->push_back(new ExpressionParsing::SGxAODProxyLoader(evtStore())); proxyLoaders->push_back(new ExpressionParsing::SGNTUPProxyLoader(evtStore())); - m_parser = new ExpressionParsing::ExpressionParser(proxyLoaders); + m_parser = std::make_unique(proxyLoaders); m_parser->loadExpression(m_selectionString); } + + if (m_trackSelectionString!="") { + ExpressionParsing::MultipleProxyLoader *proxyLoaders = new ExpressionParsing::MultipleProxyLoader(); + proxyLoaders->push_back(new ExpressionParsing::SGxAODProxyLoader(evtStore())); + proxyLoaders->push_back(new ExpressionParsing::SGNTUPProxyLoader(evtStore())); + m_trackParser = std::make_unique(proxyLoaders); + m_trackParser->loadExpression(m_trackSelectionString); + } return StatusCode::SUCCESS; } @@ -75,23 +72,17 @@ StatusCode DerivationFramework::JetTrackParticleThinning::finalize() { ATH_MSG_VERBOSE("finalize() ..."); ATH_MSG_INFO("Processed "<< m_ntot <<" tracks, "<< m_npass<< " were retained "); - if (m_selectionString!="") { - delete m_parser; - m_parser = 0; - } return StatusCode::SUCCESS; } // The thinning itself StatusCode DerivationFramework::JetTrackParticleThinning::doThinning() const { + const EventContext& ctx = Gaudi::Hive::currentContext(); // Retrieve main TrackParticle collection - const xAOD::TrackParticleContainer* importedTrackParticles; - if (evtStore()->retrieve(importedTrackParticles,m_inDetSGKey).isFailure()) { - ATH_MSG_ERROR("No TrackParticle collection with name " << m_inDetSGKey << " found in StoreGate!"); - return StatusCode::FAILURE; - } + SG::ThinningHandle importedTrackParticles + (m_inDetSGKey, ctx); // Check the event contains tracks unsigned int nTracks = importedTrackParticles->size(); @@ -153,6 +144,22 @@ StatusCode DerivationFramework::JetTrackParticleThinning::doThinning() const } } } + + // Apply a track selection string. + if (m_trackParser) { + std::vector entries = m_trackParser->evaluateAsVector(); + unsigned int nEntries = entries.size(); + // check the sizes are compatible + if (nTracks != nEntries ) { + ATH_MSG_ERROR("Sizes incompatible! Are you sure your track selection string used tracks??"); + return StatusCode::FAILURE; + } else { + // identify which jets to keep for the thinning check + for (unsigned int i=0; ifilter(*importedTrackParticles, mask, IThinningSvc::Operator::And).isFailure()) { - ATH_MSG_ERROR("Application of thinning service failed! "); - return StatusCode::FAILURE; - } - } - if (!m_and) { - if (m_thinningSvc->filter(*importedTrackParticles, mask, IThinningSvc::Operator::Or).isFailure()) { - ATH_MSG_ERROR("Application of thinning service failed! "); - return StatusCode::FAILURE; - } - } + importedTrackParticles.keep (mask); return StatusCode::SUCCESS; } diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM6.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM6.py index 567e778c04056ecf925e49cb26d8e36e21934602..f1d39c442b8d6f80c46c4a30a00645bdb05f3f7d 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM6.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM6.py @@ -78,36 +78,29 @@ ToolSvc += JETM6OfflineSkimmingTool thinningTools = [] # thinning_expression = "InDetTrackParticles.pt > 0.5*GeV" -# from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__TrackParticleThinning -# JETM6TPThinningTool = DerivationFramework__TrackParticleThinning( name = "JETM6ThinningTool", -# ThinningService = "JETM6ThinningSvc", -# SelectionString = thinning_expression, -# InDetTrackParticlesKey = "InDetTrackParticles") # from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__JetTrackParticleThinning # JETM6JetTPThinningTool = DerivationFramework__JetTrackParticleThinning( name = "JETM6Akt4JetTPThinningTool", -# ThinningService = "JETM6ThinningSvc", +# StreamName = streamName, # JetKey = "AntiKt4EMTopoJets", # InDetTrackParticlesKey = "InDetTrackParticles", -# ApplyAnd = True) +# TrackSelectionString = thinning_expression) # ToolSvc += JETM6JetTPThinningTool # thinningTools.append(JETM6JetTPThinningTool) from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__JetTrackParticleThinning JETM6Akt4JetTPThinningTool = DerivationFramework__JetTrackParticleThinning( name = "JETM6Akt4JetTPThinningTool", - ThinningService = "JETM6ThinningSvc", + StreamName = streamName, JetKey = "AntiKt4EMTopoJets", - InDetTrackParticlesKey = "InDetTrackParticles", - ApplyAnd = False) + InDetTrackParticlesKey = "InDetTrackParticles") ToolSvc += JETM6Akt4JetTPThinningTool thinningTools.append(JETM6Akt4JetTPThinningTool) from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__JetTrackParticleThinning JETM6Akt10JetTPThinningTool = DerivationFramework__JetTrackParticleThinning( name = "JETM6Akt10JetTPThinningTool", - ThinningService = "JETM6ThinningSvc", + StreamName = streamName, JetKey = "AntiKt10LCTopoJets", - InDetTrackParticlesKey = "InDetTrackParticles", - ApplyAnd = False) + InDetTrackParticlesKey = "InDetTrackParticles") ToolSvc += JETM6Akt10JetTPThinningTool thinningTools.append(JETM6Akt10JetTPThinningTool) diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSM/share/STDM2.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSM/share/STDM2.py index 989f078b64f8c3ffe8209aba1fa3690c8b078606..f75c11b3770c661cea75d91dc60e79f66550ca89 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSM/share/STDM2.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSM/share/STDM2.py @@ -73,11 +73,10 @@ ToolSvc += STDM2TPThinningTool # Tracks associated with Jets from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__JetTrackParticleThinning STDM2JetTPThinningTool = DerivationFramework__JetTrackParticleThinning( name = "STDM2JetTPThinningTool", - ThinningService = "STDM2ThinningSvc", + StreamName = streamName, JetKey = "AntiKt4LCTopoJets", InDetTrackParticlesKey = "InDetTrackParticles", - SelectionString = "AntiKt4LCTopoJets.pt > 15*GeV", - ApplyAnd = False) + SelectionString = "AntiKt4LCTopoJets.pt > 15*GeV") ToolSvc += STDM2JetTPThinningTool # All Track within a cone DeltaR=0.6 around Electrons diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSM/share/STDM3.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSM/share/STDM3.py index 8a21894c8f385348499afa8ff4b93b9dbc34fa79..e192446a4a68df1d23585b3e4a91fae7bf831278 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSM/share/STDM3.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSM/share/STDM3.py @@ -51,11 +51,10 @@ STDM3ThinningHelper.AppendToStream( STDM3Stream ) # Tracks associated with Jets from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__JetTrackParticleThinning STDM3JetTPThinningTool = DerivationFramework__JetTrackParticleThinning( name = "STDM3JetTPThinningTool", - ThinningService = STDM3ThinningHelper.ThinningSvc(), + StreamName = streamName, JetKey = "AntiKt4EMTopoJets", # SelectionString = "AntiKt4EMTopoJets.pt > 10*GeV", - InDetTrackParticlesKey = "InDetTrackParticles", - ApplyAnd = True) + InDetTrackParticlesKey = "InDetTrackParticles") ToolSvc += STDM3JetTPThinningTool thinningTools.append(STDM3JetTPThinningTool) diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSM/share/STDM4.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSM/share/STDM4.py index 506fdf225d9cac5e2459a1c0202c6d77f07ece60..fc936d870edf15d2490f7a154cddefb2dffe476f 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSM/share/STDM4.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSM/share/STDM4.py @@ -48,11 +48,10 @@ STDM4ThinningHelper.AppendToStream( STDM4Stream ) from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__JetTrackParticleThinning STDM4JetTPThinningTool = DerivationFramework__JetTrackParticleThinning( name = "STDM4JetTPThinningTool", - ThinningService = STDM4ThinningHelper.ThinningSvc(), + StreamName = streamName, JetKey = "AntiKt4EMTopoJets", SelectionString = "AntiKt4EMTopoJets.pt > 10*GeV", - InDetTrackParticlesKey = "InDetTrackParticles", - ApplyAnd = True) + InDetTrackParticlesKey = "InDetTrackParticles") ToolSvc += STDM4JetTPThinningTool thinningTools.append(STDM4JetTPThinningTool) diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSM/share/STDM5.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSM/share/STDM5.py index 35248ec1b7b4c12bc78cb510f5fca156bff66c8a..7fb3a922335f74c7f4e7f9f0c6535d5ee98c3894 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSM/share/STDM5.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSM/share/STDM5.py @@ -48,11 +48,10 @@ STDM5ThinningHelper.AppendToStream( STDM5Stream ) from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__JetTrackParticleThinning STDM5JetTPThinningTool = DerivationFramework__JetTrackParticleThinning( name = "STDM5JetTPThinningTool", - ThinningService = STDM5ThinningHelper.ThinningSvc(), + StreamName = streamName, JetKey = "AntiKt4EMTopoJets", SelectionString = "AntiKt4EMTopoJets.pt > 15*GeV", - InDetTrackParticlesKey = "InDetTrackParticles", - ApplyAnd = True) + InDetTrackParticlesKey = "InDetTrackParticles") ToolSvc += STDM5JetTPThinningTool diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY5.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY5.py index eedb0fe9fe2bb3ebb86b1081d972ae682bd66e69..85862f3324c9a4b0da7397b035fab9f7d96c66b3 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY5.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY5.py @@ -49,25 +49,18 @@ SUSY5ThinningHelper.AppendToStream( SUSY5Stream ) # MET/Jet tracks thinning_expression = "(InDetTrackParticles.pt > 0.5*GeV) && (InDetTrackParticles.numberOfPixelHits > 0) && (InDetTrackParticles.numberOfSCTHits > 5) && (abs(DFCommonInDetTrackZ0AtPV) < 1.5)" -from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__TrackParticleThinning -SUSY5MetTPThinningTool = DerivationFramework__TrackParticleThinning( name = "SUSY5MetTPThinningTool", - ThinningService = SUSY5ThinningHelper.ThinningSvc(), - SelectionString = thinning_expression, - InDetTrackParticlesKey = "InDetTrackParticles", - ApplyAnd = True) -ToolSvc += SUSY5MetTPThinningTool -thinningTools.append(SUSY5MetTPThinningTool) from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__JetTrackParticleThinning SUSY5JetTPThinningTool = DerivationFramework__JetTrackParticleThinning( name = "SUSY5JetTPThinningTool", - ThinningService = SUSY5ThinningHelper.ThinningSvc(), + StreamName = streamName, JetKey = "AntiKt4EMTopoJets", InDetTrackParticlesKey = "InDetTrackParticles", - ApplyAnd = True) + TrackSelectionString = thinning_expression) ToolSvc += SUSY5JetTPThinningTool thinningTools.append(SUSY5JetTPThinningTool) # TrackParticles directly +from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__TrackParticleThinning SUSY5TPThinningTool = DerivationFramework__TrackParticleThinning(name = "SUSY5TPThinningTool", ThinningService = SUSY5ThinningHelper.ThinningSvc(), SelectionString = "InDetTrackParticles.pt > 10*GeV", diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY8.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY8.py index e73296e9141c562f4ff6ba8e8f2b3e0beb7985af..e2c2a93a6a5094176d2c46a8f315775233ed921a 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY8.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY8.py @@ -62,22 +62,14 @@ ToolSvc += SUSY8SkimmingTool #====================================================================\ thinning_expression = "(InDetTrackParticles.pt > 10.0*GeV) && (InDetTrackParticles.numberOfPixelHits > 0) && (abs(DFCommonInDetTrackZ0AtPV) < 10.0)" -from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__TrackParticleThinning -SUSY8MetTPThinningTool = DerivationFramework__TrackParticleThinning( name = "SUSY8MetTPThinningTool", - ThinningService = SUSY8ThinningHelper.ThinningSvc(), - SelectionString = thinning_expression, - InDetTrackParticlesKey = "InDetTrackParticles", - ApplyAnd = True) -ToolSvc += SUSY8MetTPThinningTool -thinningTools.append(SUSY8MetTPThinningTool) # TrackParticles associated with jets from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__JetTrackParticleThinning SUSY8JetTPThinningTool = DerivationFramework__JetTrackParticleThinning( name = "SUSY8JetTPThinningTool", - ThinningService = SUSY8ThinningHelper.ThinningSvc(), + StreamName = streamName, JetKey = "AntiKt4EMTopoJets", InDetTrackParticlesKey = "InDetTrackParticles", - ApplyAnd = True) + TrackSelectionString = thinning_expression) ToolSvc += SUSY8JetTPThinningTool thinningTools.append(SUSY8JetTPThinningTool) diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTau/share/TAUP1.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTau/share/TAUP1.py index 3c999ca95db19bffa3bcca52609bb4c2af1e28aa..ecf672d06cd109d6dc2351be68dfebbed56c6d05 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTau/share/TAUP1.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTau/share/TAUP1.py @@ -32,22 +32,14 @@ TAUP1ThinningHelper.AppendToStream( TAUP1Stream ) # MET/Jet tracks thinning_expression = "(InDetTrackParticles.pt > 0.5*GeV) && (InDetTrackParticles.numberOfPixelHits > 0) && (InDetTrackParticles.numberOfSCTHits > 5) && (abs(DFCommonInDetTrackZ0AtPV) < 1.5)" -from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__TrackParticleThinning -TAUP1MetTPThinningTool = DerivationFramework__TrackParticleThinning( - name = "TAUP1MetTPThinningTool", - ThinningService = TAUP1ThinningHelper.ThinningSvc(), - SelectionString = thinning_expression, - InDetTrackParticlesKey = "InDetTrackParticles", - ApplyAnd = True) -ToolSvc += TAUP1MetTPThinningTool from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__JetTrackParticleThinning TAUP1JetTPThinningTool = DerivationFramework__JetTrackParticleThinning( name = "TAUP1JetTPThinningTool", - ThinningService = TAUP1ThinningHelper.ThinningSvc(), + StreamName = streamName, JetKey = "AntiKt4LCTopoJets", InDetTrackParticlesKey = "InDetTrackParticles", - ApplyAnd = True) + TrackSelectionString = thinning_expression) ToolSvc += TAUP1JetTPThinningTool from DerivationFrameworkCalo.DerivationFrameworkCaloConf import DerivationFramework__CaloClusterThinning diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTau/share/TAUP2.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTau/share/TAUP2.py index 3987cbabf31fee5e6db84f0309ad2bb6f56925de..e6b1ae4daa72d67fc71cf402d6759374baea5934 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTau/share/TAUP2.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTau/share/TAUP2.py @@ -32,22 +32,14 @@ TAUP2Stream.AcceptAlgs(["TAUP2Kernel"]) # # # MET/Jet tracks # thinning_expression = "(InDetTrackParticles.pt > 0.5*GeV) && (InDetTrackParticles.numberOfPixelHits > 0) && (InDetTrackParticles.numberOfSCTHits > 5) && (abs(DFCommonInDetTrackZ0AtPV) < 1.5)" -# from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__TrackParticleThinning -# TAUP2MetTPThinningTool = DerivationFramework__TrackParticleThinning( -# name = "TAUP2MetTPThinningTool", -# ThinningService = TAUP2ThinningHelper.ThinningSvc(), -# SelectionString = thinning_expression, -# InDetTrackParticlesKey = "InDetTrackParticles", -# ApplyAnd = True) -# ToolSvc += TAUP2MetTPThinningTool # # from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__JetTrackParticleThinning # TAUP2JetTPThinningTool = DerivationFramework__JetTrackParticleThinning( # name = "TAUP2JetTPThinningTool", -# ThinningService = TAUP2ThinningHelper.ThinningSvc(), +# StreamName = streamName, # JetKey = "AntiKt4LCTopoJets", # InDetTrackParticlesKey = "InDetTrackParticles", -# ApplyAnd = True) +# TrackSelectionString = thinning_expression) # ToolSvc += TAUP2JetTPThinningTool # # # Tracks associated with electrons diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTau/share/TAUP3.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTau/share/TAUP3.py index 26f94eb119f0dea171cdd49e7e1bd844038e097d..d91d9b93e76ad3fda455d921a741bc0b51290aff 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTau/share/TAUP3.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTau/share/TAUP3.py @@ -36,22 +36,14 @@ svcMgr += createThinningSvc( # ========================================================================================================================== # MET/Jet tracks thinning_expression = "(InDetTrackParticles.pt > 0.5*GeV) && (InDetTrackParticles.numberOfPixelHits > 0) && (InDetTrackParticles.numberOfSCTHits > 5) && (abs(DFCommonInDetTrackZ0AtPV) < 1.5)" -from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__TrackParticleThinning -TAUP3MetTPThinningTool = DerivationFramework__TrackParticleThinning( - name = "TAUP3MetTPThinningTool", - ThinningService = "TAUP3ThinningSvc", - SelectionString = thinning_expression, - InDetTrackParticlesKey = "InDetTrackParticles", - ApplyAnd = True) -ToolSvc += TAUP3MetTPThinningTool from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__JetTrackParticleThinning TAUP3JetTPThinningTool = DerivationFramework__JetTrackParticleThinning( name = "TAUP3JetTPThinningTool", - ThinningService = "TAUP3ThinningSvc", + StreamName = streamName, JetKey = "AntiKt4LCTopoJets", InDetTrackParticlesKey = "InDetTrackParticles", - ApplyAnd = True) + TrackSelectionString = thinning_expression) ToolSvc += TAUP3JetTPThinningTool from DerivationFrameworkCalo.DerivationFrameworkCaloConf import DerivationFramework__CaloClusterThinning diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTop/python/TOPQCommonThinning.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTop/python/TOPQCommonThinning.py index b97dfba33bdd7f99912f1ef8cdc19fd83d71b3e2..0fade4736df1629448066ffe4415a9e7eaab486d 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTop/python/TOPQCommonThinning.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTop/python/TOPQCommonThinning.py @@ -72,11 +72,10 @@ def setup(TOPQname, streamName, TOPQThinningSvc, ToolSvc): from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__JetTrackParticleThinning TOPQJetTPThinningTool = DerivationFramework__JetTrackParticleThinning( name = TOPQname + "JetTPThinningTool", - ThinningService = TOPQThinningSvc, + StreamName = streamName, JetKey = "AntiKt4EMTopoJets", InDetTrackParticlesKey = "InDetTrackParticles", - SelectionString = "(AntiKt4EMTopoJets.DFCommonJets_Calib_pt > 20*GeV)", - ApplyAnd = False) + SelectionString = "(AntiKt4EMTopoJets.DFCommonJets_Calib_pt > 20*GeV)") ToolSvc += TOPQJetTPThinningTool thinningTools.append(TOPQJetTPThinningTool) @@ -97,11 +96,10 @@ def setup(TOPQname, streamName, TOPQThinningSvc, ToolSvc): TOPQLargeJetTPThinningTool = DerivationFramework__JetTrackParticleThinning( name = TOPQname + "LargeJetTPThinningTool", - ThinningService = TOPQThinningSvc, + StreamName = streamName, JetKey = "AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets", InDetTrackParticlesKey = "InDetTrackParticles", - SelectionString = "AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets.pt>25*GeV", - ApplyAnd = False) + SelectionString = "AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets.pt>25*GeV") ToolSvc += TOPQLargeJetTPThinningTool thinningTools.append(TOPQLargeJetTPThinningTool)