diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM3.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM3.py
index 110a35b383e421ff22a5fb36699af72076740702..a54a799afc699ce668917ac5c328b3061bbcd931 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM3.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM3.py
@@ -30,23 +30,29 @@ TrigMatchAug, NewTrigVars = applyTriggerMatching(ToolNamePrefix="JETM3",
                                                  ElectronTriggers=electronTriggers,MuonTriggers=muonTriggers)
 
 JETM3SkimmingTools = []
+orstr  = ' || '
+andstr = ' && '
+
+elofflinesel = andstr.join(['count((Electrons.pt > 20*GeV) && (Electrons.DFCommonElectronsLHMedium)) >= 2'])
+muofflinesel = andstr.join(['count((Muons.pt > 20*GeV) && (Muons.DFCommonMuonPassPreselection)) >= 2'])
+
+electronSelection = '(' + elofflinesel + ')'
+muonSelection = '(' + muofflinesel + ')'
+
 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]
+
+  electronSelection += ' && (' + eltrigsel + ')'
+  muonSelection += ' && (' + mutrigsel + ')'
+
+expression = '( (' + electronSelection + ') || (' + muonSelection + ') )'
+
+from DerivationFrameworkTools.DerivationFrameworkToolsConf import DerivationFramework__xAODStringSkimmingTool
+JETM3SkimmingTool = DerivationFramework__xAODStringSkimmingTool( name = "JETM3SkimmingTool1",
+                                                                 expression = expression)
+ToolSvc += JETM3SkimmingTool
+JETM3SkimmingTools += [JETM3SkimmingTool]
 
 #====================================================================
 # SET UP STREAM
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM4.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM4.py
index 28a1fe57232a50e2b64d2176697adb1c9afdae1e..596748be854a61132e4bcdfe1777f9030122dd23 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM4.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM4.py
@@ -35,10 +35,10 @@ if not DerivationFrameworkIsMonteCarlo:
   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