diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JetCommonConfig.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JetCommonConfig.py index df3de614497481900d719757754cb5e3aea20ea0..31b2928bd49a9a6cddf3994abbba7d008fbbd00c 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JetCommonConfig.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JetCommonConfig.py @@ -27,7 +27,7 @@ def StandardJetsInDerivCfg(ConfigFlags): """Jet reconstruction needed for PHYS/PHYSLITE""" from JetRecConfig.StandardSmallRJets import AntiKt4EMTopo,AntiKt4EMPFlow,AntiKtVR30Rmax4Rmin02PV0Track - from JetRecConfig.StandardLargeRJets import AntiKt10LCTopoTrimmed,AntiKt10UFOCSSKSoftDrop + from JetRecConfig.StandardLargeRJets import AntiKt10UFOCSSKSoftDrop from JetRecConfig.JetRecConfig import JetRecCfg acc = ComponentAccumulator() @@ -42,8 +42,7 @@ def StandardJetsInDerivCfg(ConfigFlags): jetList = [AntiKt4EMTopo_deriv, AntiKt4EMPFlow_deriv, AntiKtVR30Rmax4Rmin02PV0Track, - AntiKt10LCTopoTrimmed,AntiKt10UFOCSSKSoftDrop] - + AntiKt10UFOCSSKSoftDrop] for jd in jetList: acc.merge(JetRecCfg(ConfigFlags,jd)) diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/python/MCTruthCommonConfig.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/python/MCTruthCommonConfig.py index 88d45596f02bd3547d7eda157c876485e506eee1..3cfdbd8cbf4e4a87d3d4f36896915528d4865fdd 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/python/MCTruthCommonConfig.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/python/MCTruthCommonConfig.py @@ -63,12 +63,12 @@ def AddTruthJetsCfg(flags): acc = ComponentAccumulator() from JetRecConfig.StandardSmallRJets import AntiKt4Truth,AntiKt4TruthWZ,AntiKt4TruthDressedWZ,AntiKtVRTruthCharged - from JetRecConfig.StandardLargeRJets import AntiKt10TruthTrimmed,AntiKt10TruthSoftDrop + from JetRecConfig.StandardLargeRJets import AntiKt10TruthSoftDrop from JetRecConfig.JetRecConfig import JetRecCfg jetList = [AntiKt4Truth,AntiKt4TruthWZ,AntiKt4TruthDressedWZ,AntiKtVRTruthCharged, - AntiKt10TruthTrimmed,AntiKt10TruthSoftDrop] + AntiKt10TruthSoftDrop] for jd in jetList: acc.merge(JetRecCfg(flags,jd)) diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PHYS.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PHYS.py index 0e20912b0fe36ed1e3e80a90a51dcba083579b13..e1664e220fc173312f3c9c65ad3d2ad58f3adb3d 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PHYS.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PHYS.py @@ -110,7 +110,6 @@ def PHYSCoreCfg(flags, name_tag='PHYS', StreamName='StreamDAOD_PHYS', TriggerLis "TauJets_MuonRM", "DiTauJets", "DiTauJetsLowPt", - "AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets", "AntiKt10UFOCSSKSoftDropBeta100Zcut10Jets", "AntiKtVR30Rmax4Rmin02PV0TrackJets", ] diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PHYSLITE.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PHYSLITE.py index b6c03e18efa8ca3109ef57718421594055695b8a..a3118bf59cfb057e02101c0ea479037028100549 100755 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PHYSLITE.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PHYSLITE.py @@ -397,7 +397,6 @@ def PHYSLITECfg(flags): 'AnalysisTauJets':'xAOD::TauJetContainer', 'AnalysisTauJetsAux':'xAOD::TauJetAuxContainer', 'MET_Core_AnalysisMET':'xAOD::MissingETContainer', 'MET_Core_AnalysisMETAux':'xAOD::MissingETAuxContainer', 'METAssoc_AnalysisMET':'xAOD::MissingETAssociationMap', 'METAssoc_AnalysisMETAux':'xAOD::MissingETAuxAssociationMap', - 'AntiKt10TruthTrimmedPtFrac5SmallR20Jets':'xAOD::JetContainer', 'AntiKt10TruthTrimmedPtFrac5SmallR20JetsAux':'xAOD::JetAuxContainer', 'AnalysisLargeRJets':'xAOD::JetContainer','AnalysisLargeRJetsAux':'xAOD::AuxContainerBase' }) diff --git a/Tools/WorkflowTestRunner/python/References.py b/Tools/WorkflowTestRunner/python/References.py index d320bb5322a1eec236775e9412175e76b1df7544..cca1ba17ab6bff58d3505c42175fba2afad81de3 100644 --- a/Tools/WorkflowTestRunner/python/References.py +++ b/Tools/WorkflowTestRunner/python/References.py @@ -30,16 +30,16 @@ references_map = { "q452": "v33", "q454": "v48", # Derivations - "data_PHYS_Run2": "v43", + "data_PHYS_Run2": "v44", "data_PHYSLITE_Run2": "v25", - "data_PHYS_Run3": "v43", + "data_PHYS_Run3": "v44", "data_PHYSLITE_Run3": "v26", - "mc_PHYS_Run2": "v55", + "mc_PHYS_Run2": "v56", "mc_PHYSLITE_Run2": "v29", - "mc_PHYS_Run3": "v58", + "mc_PHYS_Run3": "v59", "mc_PHYSLITE_Run3": "v32", - "af3_PHYS_Run2": "v5", + "af3_PHYS_Run2": "v6", "af3_PHYSLITE_Run2": "v6", - "af3_PHYS_Run3": "v39", + "af3_PHYS_Run3": "v40", "af3_PHYSLITE_Run3": "v33", }