diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D4.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D4.py index 913de4dfa9fdfbd284b933cb2ecef4df23949a68..a02b0d1f393698eacbcca4d9cc8be72a5cec4e26 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D4.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D4.py @@ -316,11 +316,10 @@ if not "HIGG2D4Jets" in OutputJets: #==================================================================== # Special jets #==================================================================== - if jetFlags.useTruth: - addTrimmedJets("AntiKt", 1.0, "TruthWZ", rclus=0.2, ptfrac=0.05, mods="groomed", includePreTools=False, algseq=higg2d4Seq,outputGroup="HIGG2D4Jets") + addTrimmedJets("AntiKt", 1.0, "TruthWZ", rclus=0.2, ptfrac=0.05, mods="groomed", includePreTools=False, algseq=higg2d4Seq,outputGroup="HIGG2D4Jets") - addTrimmedJets("AntiKt", 1.0, "LCTopo", rclus=0.2, ptfrac=0.05, mods="lctopo_groomed", includePreTools=False, algseq=higg2d4Seq,outputGroup="HIGG2D4Jets") + addDefaultTrimmedJets(higg2d4Seq,"HIGG2D4"); #==================================================================== # Create variable-R trackjets and dress AntiKt10LCTopo with ghost VR-trkjet diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D1.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D1.py index f98a9e0f15b6768b9e3109af3c79465f11c746ae..f76014a000f4fe65fed01fa2706b8fab823b1c3d 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D1.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D1.py @@ -298,13 +298,9 @@ if not "HIGG5D1Jets" in OutputJets: addStandardJets("AntiKt", 0.4, "TruthWZ", 5000, mods="truth_ungroomed", algseq=higg5d1Seq, outputGroup="HIGG5D1Jets") OutputJets["HIGG5D1Jets"].append("AntiKt4TruthWZJets") - # OutputJets["HIGG5D1Jets"].append("AntiKt10TruthWZJets") - # OutputJets["HIGG5D1Jets"].append("AntiKt10TruthJets") - # OutputJets["HIGG5D1Jets"].append("CamKt12TruthJets") addTrimmedJets("AntiKt", 1.0, "TruthWZ", rclus=0.2, ptfrac=0.05, includePreTools=False, algseq=higg5d1Seq,outputGroup="HIGG5D1Jets") - # addFilteredJets("CamKt", 1.2, "LCTopo", mumax=1.0, ymin=0.15, includePreTools=False, algseq=higg5d1Seq,outputGroup="HIGG5D1Jets") - addTrimmedJets("AntiKt", 1.0, "LCTopo", rclus=0.2, ptfrac=0.05, includePreTools=False, algseq=higg5d1Seq,outputGroup="HIGG5D1Jets") + addDefaultTrimmedJets(higg5d1Seq,"HIGG5D1"); #==================================================================== # Create variable-R trackjets and dress AntiKt10LCTopo with ghost VR-trkjet diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D2.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D2.py index 5b1d163366c375f803c8afcdcce90cf0c4bfdca9..c46f2e397169d1384b17098af625bb3336535ee7 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D2.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D2.py @@ -357,14 +357,10 @@ if not "HIGG5D2Jets" in OutputJets: #AntiKt4TruthWZJets addStandardJets("AntiKt", 0.4, "TruthWZ", 5000, mods="truth_ungroomed", algseq=higg5d2Seq, outputGroup="HIGG5D2Jets") OutputJets["HIGG5D2Jets"].append("AntiKt4TruthWZJets") - # OutputJets["HIGG5D2Jets"].append("AntiKt10TruthWZJets") - # OutputJets["HIGG5D2Jets"].append("AntiKt10TruthJets") - # OutputJets["HIGG5D2Jets"].append("CamKt12TruthJets") + addTrimmedJets("AntiKt", 1.0, "TruthWZ", rclus=0.2, ptfrac=0.05, includePreTools=False, algseq=higg5d2Seq,outputGroup="HIGG5D2Jets") - # addFilteredJets("CamKt", 1.2, "LCTopo", mumax=1.0, ymin=0.15, includePreTools=False, algseq=higg5d2Seq,outputGroup="HIGG5D2Jets") - addTrimmedJets("AntiKt", 1.0, "LCTopo", rclus=0.2, ptfrac=0.05, includePreTools=False, algseq=higg5d2Seq,outputGroup="HIGG5D2Jets") -# addDefaultTrimmedJets(higg5d2Seq,"HIGG5D2Jets") + addDefaultTrimmedJets(higg5d2Seq,"HIGG5D2"); #==================================================================== # Create variable-R trackjets and dress AntiKt10LCTopo with ghost VR-trkjet