diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM10.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM10.py index a26e1625ddd2d31bb152fbb30e18436ebfc52c6a..c730098a598da0b72fab6a03d88dbd45f3a79d74 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM10.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM10.py @@ -2,10 +2,7 @@ # JETM10.py # reductionConf flag JETM10 in Reco_tf.py #==================================================================== -from DerivationFrameworkCore.DerivationFrameworkMaster import * -from DerivationFrameworkJetEtMiss.JetCommon import * -from DerivationFrameworkJetEtMiss.ExtendedJetCommon import * -from DerivationFrameworkJetEtMiss.METCommon import * +from DerivationFrameworkCore.DerivationFrameworkMaster import DerivationFrameworkJob, buildFileName from DerivationFrameworkJetEtMiss.METTriggerDerivationContent import METTriggerDerivationContentManager #====================================================================================================================== diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM11.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM11.py index 1dccd7f1c1a469c69f7639d950bb7e9cac69eede..5fe5e7966a0182a11af84005f00cb1022cfe720c 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM11.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM11.py @@ -2,13 +2,8 @@ # JETM11.py # reductionConf flag JETM11 in Reco_tf.py #==================================================================== -from DerivationFrameworkCore.DerivationFrameworkMaster import * -from DerivationFrameworkJetEtMiss.JetCommon import * -from DerivationFrameworkJetEtMiss.ExtendedJetCommon import * -from DerivationFrameworkJetEtMiss.METCommon import * +from DerivationFrameworkCore.DerivationFrameworkMaster import DerivationFrameworkJob, buildFileName from DerivationFrameworkJetEtMiss import TriggerLists -from DerivationFrameworkEGamma.EGammaCommon import* -from DerivationFrameworkMuons.MuonsCommon import* from DerivationFrameworkJetEtMiss.METTriggerDerivationContent import METTriggerDerivationContentManager #====================================================================================================================== diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM12.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM12.py index b3a0f82e411d4f33c9f519a0a8e8908d8e49d2c9..844e58a68fe0facc1a9eb52edbf1e9026f9e542c 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM12.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM12.py @@ -3,13 +3,9 @@ # reductionConf flag JETM12 in Reco_tf.py #==================================================================== -from DerivationFrameworkCore.DerivationFrameworkMaster import * -from DerivationFrameworkInDet.InDetCommon import * -from DerivationFrameworkJetEtMiss.JetCommon import * -from DerivationFrameworkJetEtMiss.ExtendedJetCommon import * -from DerivationFrameworkEGamma.EGammaCommon import * -from DerivationFrameworkMuons.MuonsCommon import * -from DerivationFrameworkJetEtMiss.METCommon import * +from DerivationFrameworkCore.DerivationFrameworkMaster import DerivationFrameworkIsMonteCarlo, +DerivationFrameworkJob, buildFileName +from DerivationFrameworkJetEtMiss.JetCommon import OutputJets # #==================================================================== diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM14.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM14.py index 0d7e60d63616fb5747ba7c4ade48811e884ebc60..65e7db6c7d1b4d933bd7ac9c4d79d6f7eca8b459 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM14.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM14.py @@ -2,13 +2,8 @@ # JETM14.py # reductionConf flag JETM14 in Reco_tf.py #==================================================================== -from DerivationFrameworkCore.DerivationFrameworkMaster import * -from DerivationFrameworkJetEtMiss.JetCommon import * -from DerivationFrameworkJetEtMiss.ExtendedJetCommon import * -from DerivationFrameworkJetEtMiss.METCommon import * +from DerivationFrameworkCore.DerivationFrameworkMaster import DerivationFrameworkJob, buildFileName from DerivationFrameworkJetEtMiss import TriggerLists -from DerivationFrameworkEGamma.EGammaCommon import* -from DerivationFrameworkMuons.MuonsCommon import* from DerivationFrameworkJetEtMiss.METTriggerDerivationContent import METTriggerDerivationContentManager #====================================================================================================================== diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM15.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM15.py index 944ff38146d9507456e02776bcd08faeb14543c9..e706c526cab4f65911aee2a05e934cd865543c27 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM15.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM15.py @@ -3,13 +3,14 @@ # reductionConf flag JETM15 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 addJetOutputs, addStandardJets +from DerivationFrameworkJetEtMiss.ExtendedJetCommon import addDefaultTrimmedJets, addConstModJets, addConstModJets, addTCCTrimmedJets, addOriginCorrectedClusters from DerivationFrameworkEGamma.EGammaCommon import * from DerivationFrameworkMuons.MuonsCommon import * from DerivationFrameworkJetEtMiss.METCommon import * -from DerivationFrameworkFlavourTag.HbbCommon import * +from DerivationFrameworkFlavourTag.HbbCommon import addVRJets # if DerivationFrameworkIsMonteCarlo: from DerivationFrameworkMCTruth.MCTruthCommon import addStandardTruthContents diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM4.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM4.py index 2d3487cc03605e8fdd7cb4442922a90d3a29d120..28a1fe57232a50e2b64d2176697adb1c9afdae1e 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM4.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM4.py @@ -161,6 +161,14 @@ addDefaultTrimmedJets(jetm4Seq,"JETM4") from DerivationFrameworkJetEtMiss.PFlowCommon import applyPFOAugmentation applyPFOAugmentation(DerivationFrameworkJob) +#=================================================== +#add variable-R track jets for b-tagging +#=================================================== + +from DerivationFrameworkFlavourTag.HbbCommon import addVRJets +addVRJets(jetm4Seq,largeRColls=largeRJetCollections) +addVRJets(jetm4Seq,largeRColls=largeRJetCollections, training='201903') + #======================================= # SCHEDULE CUSTOM MET RECONSTRUCTION #======================================= diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM5.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM5.py index 742701a41f39de0a5f780241bad50fac5776bb93..b9e544a849bbcb8d9b0338076f631319625a2189 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM5.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM5.py @@ -3,10 +3,10 @@ # reductionConf flag JETM5 in Reco_tf.py #==================================================================== -from DerivationFrameworkCore.DerivationFrameworkMaster import * -from DerivationFrameworkJetEtMiss.JetCommon import * -from DerivationFrameworkJetEtMiss.ExtendedJetCommon import * -from DerivationFrameworkJetEtMiss.METCommon import * +from DerivationFrameworkCore.DerivationFrameworkMaster import DerivationFrameworkIsMonteCarlo, DerivationFrameworkJob, +buildFileName +from DerivationFrameworkJetEtMiss.JetCommon import addJetOutputs +from DerivationFrameworkJetEtMiss.METCommon import addMETOutputs #==================================================================== # SET UP STREAM diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM6.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM6.py index 7a4bce7012f16d5ec15f50396da158c3596147c4..f383e5581935ceade6b7ce49b824a2cad71469c6 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM6.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM6.py @@ -10,7 +10,7 @@ from DerivationFrameworkJetEtMiss.JetCommon import OutputJets #from DerivationFrameworkEGamma.EGammaCommon import * #from DerivationFrameworkMuons.MuonsCommon import * -#from DerivationFrameworkFlavourTag.HbbCommon import * +from DerivationFrameworkFlavourTag.HbbCommon import addVRJets #from DerivationFrameworkJetEtMiss.METCommon import * diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM8.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM8.py index d665c01aa80fa7a07508e6418b14f29cc3b95a03..263b91fd9b41a0fd11e98dffa7af5b57145a6c4c 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM8.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM8.py @@ -3,11 +3,12 @@ # reductionConf flag JETM8 in Reco_tf.py #==================================================================== -from DerivationFrameworkCore.DerivationFrameworkMaster import * -from DerivationFrameworkJetEtMiss.JetCommon import * -from DerivationFrameworkJetEtMiss.ExtendedJetCommon import * -from DerivationFrameworkFlavourTag.HbbCommon import * -from DerivationFrameworkFlavourTag.FlavourTagCommon import * +from DerivationFrameworkCore.DerivationFrameworkMaster import DerivationFrameworkIsMonteCarlo, +DerivationFrameworkJob, buildFileName +from DerivationFrameworkJetEtMiss.JetCommon import OutputJets, addJetOutputs +#from DerivationFrameworkJetEtMiss.ExtendedJetCommon import * +from DerivationFrameworkFlavourTag.HbbCommon import addVRJets +#from DerivationFrameworkFlavourTag.FlavourTagCommon import * #==================================================================== # SKIMMING TOOL diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM9.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM9.py index ee8b7e5dfc3f587e85dad100e26099d232aff493..f712a4a3e743e30d8d1500fe2a716e928e4f8796 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM9.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM9.py @@ -3,9 +3,10 @@ # reductionConf flag JETM9 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, addJetOutputs +from DerivationFrameworkJetEtMiss.ExtendedJetCommon import addRscanJets #from DerivationFrameworkJetEtMiss.METCommon import * #====================================================================