diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM3.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM3.py index 2db5bcfdc1b47102e15dec7712065b815de410c1..110a35b383e421ff22a5fb36699af72076740702 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM3.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM3.py @@ -24,29 +24,30 @@ from DerivationFrameworkJetEtMiss import TriggerLists electronTriggers = TriggerLists.single_el_Trig() muonTriggers = TriggerLists.single_mu_Trig() -orstr = ' || ' -andstr = ' && ' -eltrigsel = '(EventInfo.eventTypeBitmask==1) || '+orstr.join(electronTriggers) -elofflinesel = andstr.join(['count((Electrons.pt > 20*GeV) && (Electrons.DFCommonElectronsLHMedium)) >= 2']) -#electronSelection = '( (' + eltrigsel + ') && (' + elofflinesel + ') )' -electronSelection = elofflinesel - -mutrigsel = '(EventInfo.eventTypeBitmask==1) || '+orstr.join(muonTriggers) -muofflinesel = andstr.join(['count((Muons.pt > 20*GeV) && (Muons.DFCommonMuonPassPreselection)) >= 2']) -#muonSelection = '( (' + mutrigsel + ') && (' + muofflinesel + ') )' -muonSelection = muofflinesel -expression = '( ' + electronSelection + ' || ' + muonSelection + ' )' - -from DerivationFrameworkTools.DerivationFrameworkToolsConf import DerivationFramework__xAODStringSkimmingTool -JETM3SkimmingTool = DerivationFramework__xAODStringSkimmingTool( name = "JETM3SkimmingTool1", - expression = expression) -ToolSvc += JETM3SkimmingTool - #Trigger matching decorations from DerivationFrameworkCore.TriggerMatchingAugmentation import applyTriggerMatching TrigMatchAug, NewTrigVars = applyTriggerMatching(ToolNamePrefix="JETM3", ElectronTriggers=electronTriggers,MuonTriggers=muonTriggers) +JETM3SkimmingTools = [] +if not DerivationFrameworkIsMonteCarlo: + orstr = ' || ' + andstr = ' && ' + eltrigsel = orstr.join(electronTriggers) + elofflinesel = andstr.join(['count((Electrons.pt > 20*GeV) && (Electrons.DFCommonElectronsLHMedium)) >= 2']) + electronSelection = '( (' + eltrigsel + ') && (' + elofflinesel + ') )' + + mutrigsel = orstr.join(muonTriggers) + muofflinesel = andstr.join(['count((Muons.pt > 20*GeV) && (Muons.DFCommonMuonPassPreselection)) >= 2']) + muonSelection = '( (' + mutrigsel + ') && (' + muofflinesel + ') )' + expression = '( ' + electronSelection + ' || ' + muonSelection + ' )' + + from DerivationFrameworkTools.DerivationFrameworkToolsConf import DerivationFramework__xAODStringSkimmingTool + JETM3SkimmingTool = DerivationFramework__xAODStringSkimmingTool( name = "JETM3SkimmingTool1", + expression = expression) + ToolSvc += JETM3SkimmingTool + JETM3SkimmingTools += [JETM3SkimmingTool] + #==================================================================== # SET UP STREAM #==================================================================== @@ -151,7 +152,7 @@ DerivationFrameworkJob += jetm3Seq from DerivationFrameworkCore.DerivationFrameworkCoreConf import DerivationFramework__DerivationKernel jetm3Seq += CfgMgr.DerivationFramework__DerivationKernel( name = "JETM3Kernel", - SkimmingTools = [JETM3SkimmingTool], + SkimmingTools = JETM3SkimmingTools, ThinningTools = thinningTools, AugmentationTools = [TrigMatchAug]) diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM4.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM4.py index c480afdf00492c61dda27d9f2ce9fabbd4fdf486..2d3487cc03605e8fdd7cb4442922a90d3a29d120 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM4.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM4.py @@ -21,22 +21,24 @@ from DerivationFrameworkPhys import PhysCommon #==================================================================== # NOTE: need to add isSimulation as OR with trigger -from DerivationFrameworkJetEtMiss import TriggerLists -triggerlist = TriggerLists.single_photon_Trig() +JETM4SkimmingTools = [] +if not DerivationFrameworkIsMonteCarlo: + from DerivationFrameworkJetEtMiss import TriggerLists + triggerlist = TriggerLists.single_photon_Trig() -triggers = '||'.join(triggerlist) -#expression = '( (EventInfo.eventTypeBitmask==1) || ('+triggers+') )' -expression = triggers + triggers = '||'.join(triggerlist) + expression = triggers -from DerivationFrameworkTools.DerivationFrameworkToolsConf import DerivationFramework__xAODStringSkimmingTool -JETM4SkimmingTool = DerivationFramework__xAODStringSkimmingTool( name = "JETM4SkimmingTool1", - expression = expression) -ToolSvc += JETM4SkimmingTool + from DerivationFrameworkTools.DerivationFrameworkToolsConf import DerivationFramework__xAODStringSkimmingTool + JETM4SkimmingTool = DerivationFramework__xAODStringSkimmingTool( name = "JETM4SkimmingTool1", + expression = expression) + ToolSvc += JETM4SkimmingTool + JETM4SkimmingTools += [JETM4SkimmingTool] -#Trigger matching decorations -from DerivationFrameworkCore.TriggerMatchingAugmentation import applyTriggerMatching -TrigMatchAug, NewTrigVars = applyTriggerMatching(ToolNamePrefix="JETM4", - PhotonTriggers=TriggerLists.single_photon_Trig()) + #Trigger matching decorations + from DerivationFrameworkCore.TriggerMatchingAugmentation import applyTriggerMatching + TrigMatchAug, NewTrigVars = applyTriggerMatching(ToolNamePrefix="JETM4", + PhotonTriggers=TriggerLists.single_photon_Trig()) #==================================================================== # SET UP STREAM @@ -141,7 +143,7 @@ DerivationFrameworkJob += jetm4Seq from DerivationFrameworkCore.DerivationFrameworkCoreConf import DerivationFramework__DerivationKernel jetm4Seq += CfgMgr.DerivationFramework__DerivationKernel("JETM4Kernel" , - SkimmingTools = [JETM4SkimmingTool], + SkimmingTools = JETM4SkimmingTools, ThinningTools = thinningTools, AugmentationTools = [TrigMatchAug]) #====================================================================