diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM3.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM3.py
index e2be155c79b931d4914b192a0953a480139e6ccc..d393de025e56d3da2e60730671d64d0a431448dd 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM3.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM3.py
@@ -3,20 +3,18 @@
# reductionConf flag JETM3 in Reco_tf.py
#====================================================================
-from DerivationFrameworkCore.DerivationFrameworkMaster import *
-from DerivationFrameworkInDet.InDetCommon import *
-from DerivationFrameworkJetEtMiss.JetCommon import *
-from DerivationFrameworkJetEtMiss.PFlowCommon import *
-from DerivationFrameworkJetEtMiss.ExtendedJetCommon import *
-from DerivationFrameworkEGamma.EGammaCommon import *
-from DerivationFrameworkMuons.MuonsCommon import *
+from DerivationFrameworkCore.DerivationFrameworkMaster import DerivationFrameworkIsMonteCarlo, DerivationFrameworkJob, buildFileName
+from DerivationFrameworkJetEtMiss.JetCommon import OutputJets, addJetOutputs
+from DerivationFrameworkJetEtMiss.ExtendedJetCommon import addAntiKt4LowPtJets, addRscanJets, addJetPtAssociation
#
-from DerivationFrameworkJetEtMiss.METCommon import *
+from DerivationFrameworkJetEtMiss.METCommon import addMETTruthMap, scheduleMETAssocAlg, addMETOutputs
#
if DerivationFrameworkIsMonteCarlo:
from DerivationFrameworkMCTruth.MCTruthCommon import addStandardTruthContents
addStandardTruthContents()
+from DerivationFrameworkPhys import PhysCommon
+
#
#====================================================================
# SKIMMING TOOL
@@ -30,11 +28,13 @@ orstr = ' || '
andstr = ' && '
eltrigsel = '(EventInfo.eventTypeBitmask==1) || '+orstr.join(electronTriggers)
elofflinesel = andstr.join(['count((Electrons.pt > 20*GeV) && (Electrons.DFCommonElectronsLHMedium)) >= 2'])
-electronSelection = '( (' + eltrigsel + ') && (' + elofflinesel + ') )'
+#electronSelection = '( (' + eltrigsel + ') && (' + elofflinesel + ') )'
+electronSelection = elofflinesel
mutrigsel = '(EventInfo.eventTypeBitmask==1) || '+orstr.join(muonTriggers)
-muofflinesel = andstr.join(['count((Muons.pt > 20*GeV) && (Muons.DFCommonMuonsPreselection)) >= 2'])
-muonSelection = '( (' + mutrigsel + ') && (' + muofflinesel + ') )'
+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
@@ -158,56 +158,14 @@ jetm3Seq += CfgMgr.DerivationFramework__DerivationKernel( name = "JETM3Kernel",
OutputJets["JETM3"] = []
#=======================================
-# BUILD UFO INPUTS
+# Add. small-R jet stuff in derivations
#=======================================
-# Add PFlow constituents
-from JetRecTools.ConstModHelpers import getConstModSeq, xAOD
-pflowCSSKSeq = getConstModSeq(["CS","SK"], "EMPFlow")
-
-# add the pflow cssk sequence to the main jetalg if not already there :
-if pflowCSSKSeq.getFullName() not in [t.getFullName() for t in DerivationFrameworkJob.jetalg.Tools]:
- DerivationFrameworkJob.jetalg.Tools += [pflowCSSKSeq]
-
-# Add UFO constituents
-from TrackCaloClusterRecTools.TrackCaloClusterConfig import runUFOReconstruction
-emufoAlg = runUFOReconstruction(jetm3Seq,ToolSvc, PFOPrefix="CHS")
-emcsskufoAlg = runUFOReconstruction(jetm3Seq, ToolSvc, PFOPrefix="CSSK")
-
-#=======================================
-# RESTORE AOD-REDUCED JET COLLECTIONS
-#=======================================
-reducedJetList = ["AntiKt2PV0TrackJets",
- "AntiKt4PV0TrackJets",
- "AntiKt4TruthJets",
- "AntiKt10TruthJets",
- "AntiKt10UFOCSSKJets",
- "AntiKt10UFOCHSJets",
- ]
-replaceAODReducedJets(reducedJetList,jetm3Seq,"JETM3")
-
-addDefaultTrimmedJets(jetm3Seq,"JETM3")
-# UFO Trimmed jets
-addTrimmedJets("AntiKt", 1.0, "UFOCSSK", rclus=0.2, ptfrac=0.05, algseq=jetm3Seq, outputGroup="JETM3", writeUngroomed=False, mods="tcc_groomed")
-addTrimmedJets("AntiKt", 1.0, "UFOCHS", rclus=0.2, ptfrac=0.05, algseq=jetm3Seq, outputGroup="JETM3", writeUngroomed=False, mods="tcc_groomed")
-# CSSK UFO SoftDrop jets
-addSoftDropJets("AntiKt", 1.0, "UFOCSSK", beta=1.0, zcut=0.1, algseq=jetm3Seq, outputGroup="JETM3", writeUngroomed=False, mods="tcc_groomed")
-addRecursiveSoftDropJets('AntiKt', 1.0, 'UFOCSSK', beta=1.0, zcut=0.05, N=-1, mods="tcc_groomed", algseq=jetm3Seq, outputGroup="JETM3", writeUngroomed=False)
-addBottomUpSoftDropJets('AntiKt', 1.0, 'UFOCSSK', beta=1.0, zcut=0.05, mods="tcc_groomed", algseq=jetm3Seq, outputGroup="JETM3", writeUngroomed=False)
-
-if DerivationFrameworkIsMonteCarlo:
- addSoftDropJets('AntiKt', 1.0, 'Truth', beta=1.0, zcut=0.1, mods="truth_groomed", algseq=jetm3Seq, outputGroup="JETM3", writeUngroomed=False)
- addRecursiveSoftDropJets('AntiKt', 1.0, 'Truth', beta=1.0, zcut=0.05, N=-1, mods="truth_groomed", algseq=jetm3Seq, outputGroup="JETM3", writeUngroomed=False)
- addBottomUpSoftDropJets('AntiKt', 1.0, 'Truth', beta=1.0, zcut=0.05, mods="truth_groomed", algseq=jetm3Seq, outputGroup="JETM3", writeUngroomed=False)
-
-# Add the BCID info
-addDistanceInTrain(jetm3Seq)
-
#=======================================
# SCHEDULE SMALL-R JETS WITH LOW PT CUT
#=======================================
-addAntiKt4LowPtJets(jetm3Seq,"JETM3")
+addAntiKt4LowPtJets(DerivationFrameworkJob,"JETM3")
#====================================================================
#Jets for R-scan
@@ -223,15 +181,15 @@ for radius in [0.2, 0.6]:
#=======================================
if DerivationFrameworkIsMonteCarlo:
addMETTruthMap('AntiKt4EMTopo',"JETMX")
- addMETTruthMap('AntiKt4LCTopo',"JETMX")
+ #addMETTruthMap('AntiKt4LCTopo',"JETMX")
addMETTruthMap('AntiKt4EMPFlow',"JETMX")
scheduleMETAssocAlg(jetm3Seq,"JETMX")
## Add GhostTruthAssociation information ##
- addJetPtAssociation(jetalg="AntiKt4EMTopo", truthjetalg="AntiKt4TruthJets", sequence=jetm3Seq, algname="JetPtAssociationAlg")
- addJetPtAssociation(jetalg="AntiKt4LCTopo", truthjetalg="AntiKt4TruthJets", sequence=jetm3Seq, algname="JetPtAssociationAlg")
- addJetPtAssociation(jetalg="AntiKt4EMPFlow", truthjetalg="AntiKt4TruthJets", sequence=jetm3Seq, algname="JetPtAssociationAlg")
- addJetPtAssociation(jetalg="AntiKt4EMTopoLowPt", truthjetalg="AntiKt4TruthJets", sequence=jetm3Seq, algname="JetPtAssociationAlgLowPt")
- addJetPtAssociation(jetalg="AntiKt4LCTopoLowPt", truthjetalg="AntiKt4TruthJets", sequence=jetm3Seq, algname="JetPtAssociationAlgLowPt")
+ addJetPtAssociation(jetalg="AntiKt4EMTopo", truthjetalg="AntiKt4TruthJets", sequence=DerivationFrameworkJob)
+ #addJetPtAssociation(jetalg="AntiKt4LCTopo", truthjetalg="AntiKt4TruthJets", sequence=DerivationFrameworkJob)
+ addJetPtAssociation(jetalg="AntiKt4EMPFlow", truthjetalg="AntiKt4TruthJets", sequence=DerivationFrameworkJob)
+ #addJetPtAssociation(jetalg="AntiKt4EMTopoLowPt", truthjetalg="AntiKt4TruthJets", sequence=DerivationFrameworkJob)
+ #addJetPtAssociation(jetalg="AntiKt4LCTopoLowPt", truthjetalg="AntiKt4TruthJets", sequence=DerivationFrameworkJob)
#====================================================================
# ADD PFLOW AUG INFORMATION
@@ -239,22 +197,6 @@ if DerivationFrameworkIsMonteCarlo:
from DerivationFrameworkJetEtMiss.PFlowCommon import applyPFOAugmentation
applyPFOAugmentation(DerivationFrameworkJob)
-#=======================================
-# BTAGGING INFO FOR PFLOW JET
-#=======================================
-from DerivationFrameworkFlavourTag.FlavourTagCommon import FlavorTagInit
-FlavorTagInit(JetCollections = ['AntiKt4EMPFlowJets'],Sequencer = jetm3Seq)
-
-# QGTaggerTool ###
-addQGTaggerTool(jetalg="AntiKt4EMTopo", sequence=jetm3Seq, algname="QGTaggerToolAlg")
-addQGTaggerTool(jetalg="AntiKt4EMPFlow", sequence=jetm3Seq, algname="QGTaggerToolAlg")
-
-# MVfJvt #
-applyMVfJvtAugmentation(jetalg='AntiKt4EMTopo',sequence=jetm3Seq, algname='JetForwardJvtToolBDTAlg')
-
-# PFlow fJvt #
-getPFlowfJVT(jetalg='AntiKt4EMPFlow',sequence=jetm3Seq, algname='JetForwardPFlowJvtToolAlg')
-
#====================================================================
# Add the containers to the output stream - slimming done here
#====================================================================
@@ -263,7 +205,7 @@ JETM3SlimmingHelper = SlimmingHelper("JETM3SlimmingHelper")
JETM3SlimmingHelper.SmartCollections = ["Electrons", "Photons", "Muons", "TauJets",
"InDetTrackParticles", "PrimaryVertices",
"MET_Reference_AntiKt4EMTopo",
- "MET_Reference_AntiKt4LCTopo",
+ #"MET_Reference_AntiKt4LCTopo",
"MET_Reference_AntiKt4EMPFlow",
"AntiKt2LCTopoJets", "AntiKt6LCTopoJets",
"AntiKt4TruthWZJets",
@@ -280,12 +222,8 @@ JETM3SlimmingHelper.SmartCollections = ["Electrons", "Photons", "Muons", "TauJet
"AntiKt10UFOCSSKSoftDropBeta100Zcut10Jets",
"AntiKt10UFOCSSKBottomUpSoftDropBeta100Zcut5Jets",
"AntiKt10UFOCSSKRecursiveSoftDropBeta100Zcut5NinfJets",
- "AntiKt4EMPFlowJets_BTagging201810",
- "AntiKt4EMPFlowJets_BTagging201903",
- "AntiKt4EMTopoJets_BTagging201810",
- "BTagging_AntiKt4EMPFlow_201810",
- "BTagging_AntiKt4EMPFlow_201903",
- "BTagging_AntiKt4EMTopo_201810",
+ "BTagging_AntiKt4EMPFlow",
+ "BTagging_AntiKt4EMTopo",
]
JETM3SlimmingHelper.AllVariables = ["CaloCalTopoClusters",
"MuonTruthParticles", "egammaTruthParticles",
@@ -294,7 +232,7 @@ JETM3SlimmingHelper.AllVariables = ["CaloCalTopoClusters",
"LVL1JetRoIs",
"JetETMissChargedParticleFlowObjects",
"JetETMissNeutralParticleFlowObjects",
- "Kt4EMTopoOriginEventShape","Kt4LCTopoOriginEventShape","Kt4EMPFlowEventShape",
+ "Kt4EMTopoOriginEventShape","Kt4EMPFlowEventShape",#"Kt4LCTopoOriginEventShape",
]
JETM3SlimmingHelper.ExtraVariables = [
'HLT_xAOD__JetContainer_a4tcemsubjesFS.ActiveArea.ActiveArea4vec_eta.ActiveArea4vec_m.ActiveArea4vec_phi.ActiveArea4vec_pt.AlgorithmType.AverageLArQF.BchCorrCell.CentroidR.ConstituentScale.DetectorEta.EMFrac.EnergyPerSampling.FracSamplingMax.FracSamplingMaxIndex.HECFrac.HECQuality.InputType.JetConstitScaleMomentum_eta.JetConstitScaleMomentum_m.JetConstitScaleMomentum_phi.JetConstitScaleMomentum_pt.JetEMScaleMomentum_eta.JetEMScaleMomentum_m.JetEMScaleMomentum_phi.JetEMScaleMomentum_pt.JetEtaJESScaleMomentum_eta.JetEtaJESScaleMomentum_m.JetEtaJESScaleMomentum_phi.JetEtaJESScaleMomentum_pt.JetPileupScaleMomentum_eta.JetPileupScaleMomentum_m.JetPileupScaleMomentum_phi.JetPileupScaleMomentum_pt.LArQuality.N90Constituents.NegativeE.OriginCorrected.PileupCorrected.SizeParameter.Timing.eta.kinematics.m.phi.pt',
@@ -325,5 +263,3 @@ addJetOutputs(
# Add the MET containers to the stream
addMETOutputs(JETM3SlimmingHelper,["Diagnostic","Assocs","TruthAssocs","Track","JETM3"])
-
-JETM3SlimmingHelper.AppendContentToStream(JETM3Stream)
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM4.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM4.py
index 3039e4f247b7cf5831f9ebe5e03ae1de0e5aba80..e530201544a7ccc34b0d377f2b2b977c4f27f693 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM4.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM4.py
@@ -3,17 +3,19 @@
# reductionConf flag JETM4 in Reco_tf.py
#====================================================================
-from DerivationFrameworkCore.DerivationFrameworkMaster import *
-from DerivationFrameworkInDet.InDetCommon import *
-from DerivationFrameworkJetEtMiss.JetCommon import *
-from DerivationFrameworkJetEtMiss.ExtendedJetCommon import *
+from DerivationFrameworkCore.DerivationFrameworkMaster import DerivationFrameworkIsMonteCarlo, DerivationFrameworkJob, buildFileName
+#from DerivationFrameworkInDet.InDetCommon import *
+from DerivationFrameworkJetEtMiss.JetCommon import OutputJets, addJetOutputs
+from DerivationFrameworkJetEtMiss.ExtendedJetCommon import addDefaultTrimmedJets, addJetPtAssociation
#
-from DerivationFrameworkJetEtMiss.METCommon import *
+from DerivationFrameworkJetEtMiss.METCommon import addMETTruthMap, scheduleMETAssocAlg, addMETOutputs
#
if DerivationFrameworkIsMonteCarlo:
from DerivationFrameworkMCTruth.MCTruthCommon import addStandardTruthContents
addStandardTruthContents()
+from DerivationFrameworkPhys import PhysCommon
+
#====================================================================
# SKIMMING TOOL
#====================================================================
@@ -23,7 +25,8 @@ from DerivationFrameworkJetEtMiss import TriggerLists
triggerlist = TriggerLists.single_photon_Trig()
triggers = '||'.join(triggerlist)
-expression = '( (EventInfo.eventTypeBitmask==1) || ('+triggers+') )'
+#expression = '( (EventInfo.eventTypeBitmask==1) || ('+triggers+') )'
+expression = triggers
from DerivationFrameworkTools.DerivationFrameworkToolsConf import DerivationFramework__xAODStringSkimmingTool
JETM4SkimmingTool = DerivationFramework__xAODStringSkimmingTool( name = "JETM4SkimmingTool1",
@@ -147,46 +150,9 @@ jetm4Seq += CfgMgr.DerivationFramework__DerivationKernel("JETM4Kernel" ,
OutputJets["JETM4"] = []
-#====================================================================
-# BUILD UFO INPUTS
-#====================================================================
-
-from JetRecTools.ConstModHelpers import getConstModSeq
-pflowCSSKSeq = getConstModSeq(["CS","SK"], "EMPFlow")
-
-# add the pflow cssk sequence to the main jetalg if not already there :
-if pflowCSSKSeq.getFullName() not in [t.getFullName() for t in DerivationFrameworkJob.jetalg.Tools]:
- DerivationFrameworkJob.jetalg.Tools += [pflowCSSKSeq]
-
-from TrackCaloClusterRecTools.TrackCaloClusterConfig import runUFOReconstruction
-emufoAlg = runUFOReconstruction(jetm4Seq,ToolSvc, PFOPrefix="CHS")
-runUFOReconstruction(jetm4Seq, ToolSvc, PFOPrefix="CSSK")
-
-#=======================================
-# RESTORE AOD-REDUCED JET COLLECTIONS
-#=======================================
-reducedJetList = ["AntiKt2PV0TrackJets",
- "AntiKt4PV0TrackJets",
- "AntiKt10PV0TrackJets",
- "AntiKt4TruthJets",
- "AntiKt10TruthJets",
- "AntiKt10LCTopoJets",
- "AntiKt10TruthJets",
- "AntiKt10UFOCSSKJets",
- "AntiKt10UFOCHSJets"]
-replaceAODReducedJets(reducedJetList,jetm4Seq,"JETM4")
-
# AntiKt10*PtFrac5Rclus20
addDefaultTrimmedJets(jetm4Seq,"JETM4")
-# UFO Trimmed jets
-addTrimmedJets("AntiKt", 1.0, "UFOCSSK", rclus=0.2, ptfrac=0.05, algseq=jetm4Seq, outputGroup="JETM4", writeUngroomed=False, mods="tcc_groomed")
-addTrimmedJets("AntiKt", 1.0, "UFOCHS", rclus=0.2, ptfrac=0.05, algseq=jetm4Seq, outputGroup="JETM4", writeUngroomed=False, mods="tcc_groomed")
-# CSSK UFO SoftDrop jets
-addSoftDropJets("AntiKt", 1.0, "UFOCSSK", beta=1.0, zcut=0.1, algseq=jetm4Seq, outputGroup="JETM4", writeUngroomed=False, mods="tcc_groomed")
-addRecursiveSoftDropJets('AntiKt', 1.0, 'UFOCSSK', beta=1.0, zcut=0.05, N=-1, mods="tcc_groomed", algseq=jetm4Seq, outputGroup="JETM4", writeUngroomed=False)
-addBottomUpSoftDropJets('AntiKt', 1.0, 'UFOCSSK', beta=1.0, zcut=0.05, mods="tcc_groomed", algseq=jetm4Seq, outputGroup="JETM4", writeUngroomed=False)
-
#====================================================================
# ADD PFLOW AUG INFORMATION
#====================================================================
@@ -202,43 +168,15 @@ if DerivationFrameworkIsMonteCarlo:
addMETTruthMap('AntiKt4LCTopo',"JETMX")
addMETTruthMap('AntiKt4EMPFlow',"JETMX")
scheduleMETAssocAlg(jetm4Seq,"JETMX")
- addJetPtAssociation(jetalg="AntiKt4EMTopo", truthjetalg="AntiKt4TruthJets", sequence=jetm4Seq, algname="JetPtAssociationAlg")
- addJetPtAssociation(jetalg="AntiKt4LCTopo", truthjetalg="AntiKt4TruthJets", sequence=jetm4Seq, algname="JetPtAssociationAlg")
- addJetPtAssociation(jetalg="AntiKt4EMPFlow", truthjetalg="AntiKt4TruthJets", sequence=jetm4Seq, algname="JetPtAssociationAlg")
-
-
-#===================================================
-#add variable-R track jets for b-tagging
-#===================================================
-
-largeRJetCollections = [
- "AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets",
- "AntiKt10UFOCSSKTrimmedPtFrac5SmallR20Jets",
- "AntiKt10UFOCHSTrimmedPtFrac5SmallR20Jets",
- "AntiKt10UFOCSSKSoftDropBeta100Zcut10Jets",
- "AntiKt10UFOCSSKBottomUpSoftDropBeta100Zcut5Jets",
- "AntiKt10UFOCSSKRecursiveSoftDropBeta100Zcut5NinfJets",
- ]
-
-from DerivationFrameworkFlavourTag.HbbCommon import addVRJets
-addVRJets(jetm4Seq,largeRColls=largeRJetCollections)
-addVRJets(jetm4Seq,largeRColls=largeRJetCollections, training='201903')
-
-from BTagging.BTaggingFlags import BTaggingFlags
-BTaggingFlags.CalibrationChannelAliases += ["AntiKtVR30Rmax4Rmin02Track->AntiKtVR30Rmax4Rmin02Track,AntiKt4EMTopo"]
-
-#=======================================
-# Re-tag PFlow jets so they have b-tagging info
-#=======================================
-
-from DerivationFrameworkFlavourTag.FlavourTagCommon import FlavorTagInit
-FlavorTagInit(JetCollections = ['AntiKt4EMPFlowJets'], Sequencer = jetm4Seq)
+ addJetPtAssociation(jetalg="AntiKt4EMTopo", truthjetalg="AntiKt4TruthJets", sequence=DerivationFrameworkJob)
+ addJetPtAssociation(jetalg="AntiKt4LCTopo", truthjetalg="AntiKt4TruthJets", sequence=DerivationFrameworkJob)
+ addJetPtAssociation(jetalg="AntiKt4EMPFlow", truthjetalg="AntiKt4TruthJets", sequence=DerivationFrameworkJob)
#===============================
# add xbb taggers
#===============================
-from DerivationFrameworkFlavourTag.HbbCommon import addRecommendedXbbTaggers
-addRecommendedXbbTaggers(jetm4Seq, ToolSvc)
+#from DerivationFrameworkFlavourTag.HbbCommon import addRecommendedXbbTaggers
+#addRecommendedXbbTaggers(jetm4Seq, ToolSvc)
#====================================================================
@@ -262,16 +200,15 @@ JETM4SlimmingHelper.SmartCollections = ["Electrons", "Photons", "Muons", "TauJet
"AntiKt10UFOCSSKSoftDropBeta100Zcut10Jets",
"AntiKt10UFOCSSKBottomUpSoftDropBeta100Zcut5Jets",
"AntiKt10UFOCSSKRecursiveSoftDropBeta100Zcut5NinfJets",
- "AntiKtVR30Rmax4Rmin02TrackJets_BTagging201810",
- "AntiKtVR30Rmax4Rmin02TrackJets_BTagging201903",
- "AntiKt4EMPFlowJets_BTagging201810",
- "AntiKt4EMPFlowJets_BTagging201903",
- "AntiKt4EMTopoJets_BTagging201810",
- "BTagging_AntiKt4EMPFlow_201810",
- "BTagging_AntiKt4EMPFlow_201903",
- "BTagging_AntiKt4EMTopo_201810",
- "BTagging_AntiKtVR30Rmax4Rmin02Track_201810",
- "BTagging_AntiKtVR30Rmax4Rmin02Track_201903"
+ #"AntiKtVR30Rmax4Rmin02TrackJets_BTagging201810",
+ #"AntiKtVR30Rmax4Rmin02TrackJets_BTagging201903",
+ #"AntiKt4EMPFlowJets_BTagging201810",
+ #"AntiKt4EMPFlowJets_BTagging201903",
+ #"AntiKt4EMTopoJets_BTagging201810",
+ "BTagging_AntiKt4EMPFlow",
+ "BTagging_AntiKt4EMTopo",
+ "BTagging_AntiKtVR30Rmax4Rmin02Track"
+
]
JETM4SlimmingHelper.AllVariables = [# "CaloCalTopoClusters",
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM6.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM6.py
index 9013ca9aaceff1865e98cd7caa9908b657fb062c..7a4bce7012f16d5ec15f50396da158c3596147c4 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM6.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM6.py
@@ -3,18 +3,20 @@
# reductionConf flag JETM6 in Reco_tf.py
#====================================================================
-from DerivationFrameworkCore.DerivationFrameworkMaster import *
-from DerivationFrameworkJetEtMiss.JetCommon import *
-from DerivationFrameworkJetEtMiss.ExtendedJetCommon import *
+from DerivationFrameworkCore.DerivationFrameworkMaster import DerivationFrameworkIsMonteCarlo, DerivationFrameworkJob, buildFileName
+from DerivationFrameworkJetEtMiss.JetCommon import OutputJets
+#from DerivationFrameworkJetEtMiss.ExtendedJetCommon import *
-from DerivationFrameworkEGamma.EGammaCommon import *
-from DerivationFrameworkMuons.MuonsCommon import *
+#from DerivationFrameworkEGamma.EGammaCommon import *
+#from DerivationFrameworkMuons.MuonsCommon import *
-from DerivationFrameworkFlavourTag.HbbCommon import *
+#from DerivationFrameworkFlavourTag.HbbCommon import *
-from DerivationFrameworkJetEtMiss.METCommon import *
+#from DerivationFrameworkJetEtMiss.METCommon import *
-from DerivationFrameworkInDet.InDetCommon import *
+#from DerivationFrameworkInDet.InDetCommon import *
+
+#from DerivationFrameworkPhys import PhysCommon
#====================================================================
# SET UP STREAM
@@ -386,16 +388,14 @@ JETM6SlimmingHelper.SmartCollections = ["Electrons",
"AntiKt10UFOCSSKSoftDropBeta100Zcut10Jets",
"AntiKt10UFOCSSKBottomUpSoftDropBeta100Zcut5Jets",
"AntiKt10UFOCSSKRecursiveSoftDropBeta100Zcut5NinfJets",
- "AntiKtVR30Rmax4Rmin02TrackJets_BTagging201810",
- "AntiKtVR30Rmax4Rmin02TrackJets_BTagging201903",
- "AntiKt4EMPFlowJets_BTagging201810",
- "AntiKt4EMPFlowJets_BTagging201903",
- "AntiKt4EMTopoJets_BTagging201810",
- "BTagging_AntiKtVR30Rmax4Rmin02Track_201810",
- "BTagging_AntiKtVR30Rmax4Rmin02Track_201903",
- "BTagging_AntiKt4EMPFlow_201810",
- "BTagging_AntiKt4EMPFlow_201903",
- "BTagging_AntiKt4EMTopo_201810",
+ #"AntiKtVR30Rmax4Rmin02TrackJets_BTagging201810",
+ #"AntiKtVR30Rmax4Rmin02TrackJets_BTagging201903",
+ #"AntiKt4EMPFlowJets_BTagging201810",
+ #"AntiKt4EMPFlowJets_BTagging201903",
+ #"AntiKt4EMTopoJets_BTagging201810",
+ "BTagging_AntiKtVR30Rmax4Rmin02Track",
+ "BTagging_AntiKt4EMPFlow",
+ "BTagging_AntiKt4EMTopo",
]
JETM6SlimmingHelper.AllVariables = [
"TruthEvents",