diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/ContainersOnTheFly.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/ContainersOnTheFly.py index 19500d986eba0bc7ceb32c7c41f86a387e28b95f..c2716222a309ffd6c6b1400ed227a6c6b545671b 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/ContainersOnTheFly.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/ContainersOnTheFly.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration # List of containers that are made on-the-fly by basically all DAOD types and # can therefore be reasonably added to the NameAndTypes dictionary centrally @@ -46,16 +46,6 @@ ContainersOnTheFly = [ ["AntiKt4PV0TrackJetsAux","xAOD::JetAuxContainer"], ["AntiKtVR30Rmax4Rmin02PV0TrackJets","xAOD::JetContainer"], ["AntiKtVR30Rmax4Rmin02PV0TrackJetsAux","xAOD::JetAuxContainer"], - ["AntiKt10LCTopoTrimmedPtFrac5SmallR20ExKt2SubJets","xAOD::JetContainer"], - ["AntiKt10LCTopoTrimmedPtFrac5SmallR20ExKt2SubJetsAux","xAOD::JetAuxContainer"], - ["AntiKt10LCTopoTrimmedPtFrac5SmallR20ExKt3SubJets","xAOD::JetContainer"], - ["AntiKt10LCTopoTrimmedPtFrac5SmallR20ExKt3SubJetsAux","xAOD::JetAuxContainer"], - ["AntiKt10LCTopoTrimmedPtFrac5SmallR20ExKt2GASubJets","xAOD::JetContainer"], - ["AntiKt10LCTopoTrimmedPtFrac5SmallR20ExKt2GASubJetsAux","xAOD::JetAuxContainer"], - ["AntiKt10LCTopoTrimmedPtFrac5SmallR20ExKt3GASubJets","xAOD::JetContainer"], - ["AntiKt10LCTopoTrimmedPtFrac5SmallR20ExKt3GASubJetsAux","xAOD::JetAuxContainer"], - ["AntiKt10LCTopoTrimmedPtFrac5SmallR20ExCoM2SubJets","xAOD::JetContainer"], - ["AntiKt10LCTopoTrimmedPtFrac5SmallR20ExCoM2SubJetsAux","xAOD::JetAuxContainer"], ["AntiKt2LCTopoJets","xAOD::JetContainer"], ["AntiKt2LCTopoJetsAux","xAOD::JetAuxContainer"], ["AntiKt4EMTopoJets","xAOD::JetContainer"], @@ -69,17 +59,20 @@ ContainersOnTheFly = [ ["AntiKt4EMPFlowCSSKJets","xAOD::JetContainer"], ["AntiKt4EMPFlowCSSKJetsAux","xAOD::JetAuxContainer"], - ["AntiKt10LCTopoJets","xAOD::JetContainer"], ["AntiKt10LCTopoJetsAux","xAOD::JetAuxContainer"], + ["AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets","xAOD::JetContainer"], + ["AntiKt10LCTopoTrimmedPtFrac5SmallR20JetsAux","xAOD::JetAuxContainer"], + ["AntiKt10TruthTrimmedPtFrac5SmallR20Jets","xAOD::JetContainer"], + ["AntiKt10TruthTrimmedPtFrac5SmallR20JetsAux","xAOD::JetAuxContainer"], ["AntiKt10TrackCaloClusterJets","xAOD::JetContainer"], ["AntiKt10TrackCaloClusterJetsAux","xAOD::JetAuxContainer"], - ["AntiKt10LCTopoCSSKSoftDropBeta100Zcut10Jets","xAOD::JetContainer"], - ["AntiKt10LCTopoCSSKSoftDropBeta100Zcut10JetsAux","xAOD::JetAuxContainer"], - ["AntiKt10LCTopoCSSKJets","xAOD::JetContainer"], - ["AntiKt10LCTopoCSSKJetsAux","xAOD::JetAuxContainer"], ["AntiKt10UFOCSSKJets","xAOD::JetContainer"], ["AntiKt10UFOCSSKJetsAux","xAOD::JetAuxContainer"], + ["AntiKt10UFOCSSKSoftDropBeta100Zcut10Jets","xAOD::JetContainer"], + ["AntiKt10UFOCSSKSoftDropBeta100Zcut10JetsAux","xAOD::JetAuxContainer"], + ["AntiKt10TruthSoftDropBeta100Zcut10Jets","xAOD::JetContainer"], + ["AntiKt10TruthSoftDropBeta100Zcut10JetsAux","xAOD::JetAuxContainer"], ["Kt4EMPFlowEventShape","xAOD::EventShape"], ["Kt4EMPFlowEventShapeAux","xAOD::EventShapeAuxInfo"], diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/FullListOfSmartContainers.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/FullListOfSmartContainers.py index 7ca312d78046e3522109c7bef840d4cda6ea766e..9733860a67a344f70039e2c2d45285470670fa9b 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/FullListOfSmartContainers.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/FullListOfSmartContainers.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration FullListOfSmartContainers = [ "EventInfo", @@ -11,19 +11,12 @@ FullListOfSmartContainers = [ "TauMVATESJets", "DiTauJets", "DiTauJetsLowPt", - "MET_Reference_AntiKt4LCTopo", - "MET_Reference_AntiKt4EMTopo", - "MET_Reference_AntiKt4EMPFlow", "MET_Baseline_AntiKt4EMTopo", "MET_Baseline_AntiKt4EMPFlow", "AntiKt2TruthJets", "AntiKt4TruthJets", "AntiKt4TruthWZJets", "AntiKt4TruthDressedWZJets", - "AntiKt2LCTopoJets", - "AntiKt4LCTopoJets", - "AntiKt6LCTopoJets", - "AntiKt4EMTopoJets", "AntiKt10TruthJets", "AntiKt10TruthWZJets", "AntiKt10LCTopoJets", @@ -34,25 +27,12 @@ FullListOfSmartContainers = [ "AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets", "AntiKt10TrackCaloClusterTrimmedPtFrac5SmallR20Jets", "AntiKt10EMPFlowTrimmedPtFrac5SmallR20Jets", - "AntiKt10UFOCHSTrimmedPtFrac5SmallR20Jets", - "AntiKt10UFOCSSKTrimmedPtFrac5SmallR20Jets", "AntiKt10TruthSoftDropBeta100Zcut10Jets", - "AntiKt10LCTopoCSSKSoftDropBeta100Zcut10Jets", "AntiKt10UFOCSSKSoftDropBeta100Zcut10Jets", "AntiKt10UFOCHSSoftDropBeta100Zcut10Jets", - "AntiKt10TruthBottomUpSoftDropBeta100Zcut5Jets", - "AntiKt10UFOCSSKBottomUpSoftDropBeta100Zcut5Jets", - "AntiKt10TruthRecursiveSoftDropBeta100Zcut5NinfJets", - "AntiKt10UFOCSSKRecursiveSoftDropBeta100Zcut5NinfJets", - "AntiKt10LCTopoTrimmedPtFrac5SmallR20ExKt2SubJets", - "AntiKt10LCTopoTrimmedPtFrac5SmallR20ExKt3SubJets", - "AntiKt10LCTopoTrimmedPtFrac5SmallR20ExKt2GASubJets", - "AntiKt10LCTopoTrimmedPtFrac5SmallR20ExKt3GASubJets", + "AntiKt4LCTopoJets", + "AntiKt4EMTopoJets", "AntiKt4EMPFlowJets", - "AntiKt4EMPTopoJets", - "AntiKt4EMPFlowJets_BTagging201903", - "AntiKt4EMPFlowJets_BTagging201810", - "AntiKt4EMTopoJets_BTagging201810", "AntiKt2LCTopoJets", "AntiKt3LCTopoJets", "AntiKt5LCTopoJets", @@ -60,40 +40,11 @@ FullListOfSmartContainers = [ "AntiKt7LCTopoJets", "AntiKt8LCTopoJets", "AntiKt8EMTopoJets", - "AntiKt8EMTopoExKt2SubJets", - "AntiKt8EMTopoExKt3SubJets", - "AntiKt8EMTopoExCoM2SubJets", "AntiKt8EMPFlowJets", - "AntiKt8EMPFlowExKt2SubJets", - "AntiKt8EMPFlowExKt3SubJets", - "AntiKt8EMPFlowExKt2GASubJets", - "AntiKt8EMPFlowExKt3GASubJets", "AntiKtVR30Rmax4Rmin02PV0TrackJets", - "BTagging_AntiKt4EMTopo_201810", - "BTagging_AntiKt4EMPFlow_201810", - "BTagging_AntiKt4EMPFlow_201903", "BTagging_AntiKt4EMPFlow", "BTagging_AntiKt4EMTopo", "BTagging_AntiKtVR30Rmax4Rmin02Track", - "BTagging_AntiKtVR30Rmax4Rmin02Track_201810", - "BTagging_AntiKtVR30Rmax4Rmin02Track_201810GhostTag", - "BTagging_AntiKtVR30Rmax4Rmin02Track_201810_expert", - "BTagging_AntiKtVR30Rmax4Rmin02Track_201903", - "BTagging_AntiKtVR30Rmax4Rmin02Track_201903_expert", - "BTagging_AntiKtVR30Rmax4Rmin02Track_201810GhostTag", - "BTagging_AntiKtVR30Rmax4Rmin02Track_201810GhostTag_expert", - "BTagging_AntiKt8EMTopoExKt2Sub", - "BTagging_AntiKt8EMTopoExKt3Sub", - "BTagging_AntiKt8EMPFlowExKt2Sub", - "BTagging_AntiKt8EMPFlowExKt3Sub", - "BTagging_AntiKt8EMPFlowExKt2GASub", - "BTagging_AntiKt8EMPFlowExKt3GASub", - "BTagging_AntiKt8EMTopoExCoM2Sub", - "BTagging_AntiKt10LCTopoTrimmedPtFrac5SmallR20ExKt2Sub_expert", - "BTagging_AntiKt10LCTopoTrimmedPtFrac5SmallR20ExKt3Sub_expert", - "BTagging_AntiKt10LCTopoTrimmedPtFrac5SmallR20ExKt2GASub_expert", - "BTagging_AntiKt10LCTopoTrimmedPtFrac5SmallR20ExKt3GASub_expert", - "BTagging_AntiKt10LCTopoTrimmedPtFrac5SmallR20ExCoM2Sub_expert", "BTagging_AntiKt4HI", "BTagging_DFAntiKt4HI", "InDetTrackParticles", diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/SlimmingHelper.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/SlimmingHelper.py index 8637317e96c17db05377ec4384d36e475d7bccd4..791216b3097549a57a155fdf389cc2c27c6b0ef1 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/SlimmingHelper.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/SlimmingHelper.py @@ -369,15 +369,6 @@ class SlimmingHelper: elif collectionName=="DiTauJetsLowPt": from DerivationFrameworkTau.DiTauJetsLowPtCPContent import DiTauJetsLowPtCPContent items.extend(DiTauJetsLowPtCPContent) - elif collectionName=="MET_Reference_AntiKt4LCTopo": - from DerivationFrameworkJetEtMiss.MET_Reference_AntiKt4LCTopoCPContent import MET_Reference_AntiKt4LCTopoCPContent - items.extend(MET_Reference_AntiKt4LCTopoCPContent) - elif collectionName=="MET_Reference_AntiKt4EMTopo": - from DerivationFrameworkJetEtMiss.MET_Reference_AntiKt4EMTopoCPContent import MET_Reference_AntiKt4EMTopoCPContent - items.extend(MET_Reference_AntiKt4EMTopoCPContent) - elif collectionName=="MET_Reference_AntiKt4EMPFlow": - from DerivationFrameworkJetEtMiss.MET_Reference_AntiKt4EMPFlowCPContent import MET_Reference_AntiKt4EMPFlowCPContent - items.extend(MET_Reference_AntiKt4EMPFlowCPContent) elif collectionName=="MET_Baseline_AntiKt4EMTopo": from DerivationFrameworkJetEtMiss.MET_Baseline_AntiKt4EMTopoCPContent import MET_Baseline_AntiKt4EMTopoCPContent items.extend(MET_Baseline_AntiKt4EMTopoCPContent) @@ -425,94 +416,28 @@ class SlimmingHelper: items.extend(AntiKt10UFOCHSJetsCPContent) elif collectionName=="AntiKt10TruthTrimmedPtFrac5SmallR20Jets": from DerivationFrameworkJetEtMiss.AntiKt10TruthTrimmedPtFrac5SmallR20JetsCPContent import AntiKt10TruthTrimmedPtFrac5SmallR20JetsCPContent - if "AntiKt10TruthTrimmedPtFrac5SmallR20Jets" not in self.AppendToDictionary: - self.AppendToDictionary["AntiKt10TruthTrimmedPtFrac5SmallR20Jets"]="xAOD::JetContainer" - self.AppendToDictionary["AntiKt10TruthTrimmedPtFrac5SmallR20JetsAux"]='xAOD::JetAuxContainer' items.extend(AntiKt10TruthTrimmedPtFrac5SmallR20JetsCPContent) elif collectionName=="AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets": from DerivationFrameworkJetEtMiss.AntiKt10LCTopoTrimmedPtFrac5SmallR20JetsCPContent import AntiKt10LCTopoTrimmedPtFrac5SmallR20JetsCPContent - if "AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets" not in self.AppendToDictionary: - self.AppendToDictionary["AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets"]='xAOD::JetContainer' - self.AppendToDictionary["AntiKt10LCTopoTrimmedPtFrac5SmallR20JetsAux"]='xAOD::JetAuxContainer' - if "AntiKt10TruthTrimmedPtFrac5SmallR20Jets" not in self.AppendToDictionary: - self.AppendToDictionary["AntiKt10TruthTrimmedPtFrac5SmallR20Jets"]="xAOD::JetContainer" - self.AppendToDictionary["AntiKt10TruthTrimmedPtFrac5SmallR20JetsAux"]='xAOD::JetAuxContainer' items.extend(AntiKt10LCTopoTrimmedPtFrac5SmallR20JetsCPContent) elif collectionName=="AntiKt10TrackCaloClusterTrimmedPtFrac5SmallR20Jets": from DerivationFrameworkJetEtMiss.AntiKt10TrackCaloClusterTrimmedPtFrac5SmallR20JetsCPContent import AntiKt10TrackCaloClusterTrimmedPtFrac5SmallR20JetsCPContent if "AntiKt10TrackCaloClusterTrimmedPtFrac5SmallR20Jets" not in self.AppendToDictionary: self.AppendToDictionary["AntiKt10TrackCaloClusterTrimmedPtFrac5SmallR20Jets"]='xAOD::JetContainer' self.AppendToDictionary["AntiKt10TrackCaloClusterTrimmedPtFrac5SmallR20JetsAux"]='xAOD::JetAuxContainer' - if "AntiKt10TruthTrimmedPtFrac5SmallR20Jets" not in self.AppendToDictionary: - self.AppendToDictionary["AntiKt10TruthTrimmedPtFrac5SmallR20Jets"]="xAOD::JetContainer" - self.AppendToDictionary["AntiKt10TruthTrimmedPtFrac5SmallR20JetsAux"]='xAOD::JetAuxContainer' items.extend(AntiKt10TrackCaloClusterTrimmedPtFrac5SmallR20JetsCPContent) elif collectionName=="AntiKt10EMPFlowTrimmedPtFrac5SmallR20Jets": from DerivationFrameworkJetEtMiss.AntiKt10EMPFlowTrimmedPtFrac5SmallR20JetsCPContent import AntiKt10EMPFlowTrimmedPtFrac5SmallR20JetsCPContent items.extend(AntiKt10EMPFlowTrimmedPtFrac5SmallR20JetsCPContent) - elif collectionName=="AntiKt10UFOCHSTrimmedPtFrac5SmallR20Jets": - from DerivationFrameworkJetEtMiss.AntiKt10UFOCHSTrimmedPtFrac5SmallR20JetsCPContent import AntiKt10UFOCHSTrimmedPtFrac5SmallR20JetsCPContent - items.extend(AntiKt10UFOCHSTrimmedPtFrac5SmallR20JetsCPContent) - elif collectionName=="AntiKt10UFOCSSKTrimmedPtFrac5SmallR20Jets": - from DerivationFrameworkJetEtMiss.AntiKt10UFOCSSKTrimmedPtFrac5SmallR20JetsCPContent import AntiKt10UFOCSSKTrimmedPtFrac5SmallR20JetsCPContent - if "AntiKt10UFOCSSKTrimmedPtFrac5SmallR20Jets" not in self.AppendToDictionary: - self.AppendToDictionary["AntiKt10UFOCSSKTrimmedPtFrac5SmallR20Jets"]='xAOD::JetContainer' - self.AppendToDictionary["AntiKt10UFOCSSKTrimmedPtFrac5SmallR20JetsAux"]='xAOD::JetAuxContainer' - if "AntiKt10TruthTrimmedPtFrac5SmallR20Jets" not in self.AppendToDictionary: - self.AppendToDictionary["AntiKt10TruthTrimmedPtFrac5SmallR20Jets"]="xAOD::JetContainer" - self.AppendToDictionary["AntiKt10TruthTrimmedPtFrac5SmallR20JetsAux"]='xAOD::JetAuxContainer' - items.extend(AntiKt10UFOCSSKTrimmedPtFrac5SmallR20JetsCPContent) elif collectionName=="AntiKt10TruthSoftDropBeta100Zcut10Jets": from DerivationFrameworkJetEtMiss.AntiKt10TruthSoftDropBeta100Zcut10JetsCPContent import AntiKt10TruthSoftDropBeta100Zcut10JetsCPContent - if "AntiKt10TruthSoftDropBeta100Zcut10Jets" not in self.AppendToDictionary: - self.AppendToDictionary["AntiKt10TruthSoftDropBeta100Zcut10Jets"]="xAOD::JetContainer" - self.AppendToDictionary["AntiKt10TruthSoftDropBeta100Zcut10JetsAux"]='xAOD::JetAuxContainer' items.extend(AntiKt10TruthSoftDropBeta100Zcut10JetsCPContent) - elif collectionName=="AntiKt10LCTopoCSSKSoftDropBeta100Zcut10Jets": - from DerivationFrameworkJetEtMiss.AntiKt10LCTopoCSSKSoftDropBeta100Zcut10JetsCPContent import AntiKt10LCTopoCSSKSoftDropBeta100Zcut10JetsCPContent - items.extend(AntiKt10LCTopoCSSKSoftDropBeta100Zcut10JetsCPContent) elif collectionName=="AntiKt10UFOCHSSoftDropBeta100Zcut10Jets": from DerivationFrameworkJetEtMiss.AntiKt10UFOCHSSoftDropBeta100Zcut10JetsCPContent import AntiKt10UFOCHSSoftDropBeta100Zcut10JetsCPContent items.extend(AntiKt10UFOCHSSoftDropBeta100Zcut10JetsCPContent) elif collectionName=="AntiKt10UFOCSSKSoftDropBeta100Zcut10Jets": from DerivationFrameworkJetEtMiss.AntiKt10UFOCSSKSoftDropBeta100Zcut10JetsCPContent import AntiKt10UFOCSSKSoftDropBeta100Zcut10JetsCPContent - if "AntiKt10UFOCSSKSoftDropBeta100Zcut10Jets" not in self.AppendToDictionary: - self.AppendToDictionary["AntiKt10UFOCSSKSoftDropBeta100Zcut10Jets"]='xAOD::JetContainer' - self.AppendToDictionary["AntiKt10UFOCSSKSoftDropBeta100Zcut10JetsAux"]='xAOD::JetAuxContainer' - if "AntiKt10TruthSoftDropBeta100Zcut10Jets" not in self.AppendToDictionary: - self.AppendToDictionary["AntiKt10TruthSoftDropBeta100Zcut10Jets"]="xAOD::JetContainer" - self.AppendToDictionary["AntiKt10TruthSoftDropBeta100Zcut10JetsAux"]='xAOD::JetAuxContainer' items.extend(AntiKt10UFOCSSKSoftDropBeta100Zcut10JetsCPContent) - elif collectionName=="AntiKt10TruthBottomUpSoftDropBeta100Zcut5Jets": - from DerivationFrameworkJetEtMiss.AntiKt10TruthBottomUpSoftDropBeta100Zcut5JetsCPContent import AntiKt10TruthBottomUpSoftDropBeta100Zcut5JetsCPContent - if "AntiKt10TruthBottomUpSoftDropBeta100Zcut5Jets" not in self.AppendToDictionary: - self.AppendToDictionary["AntiKt10TruthBottomUpSoftDropBeta100Zcut5Jets"]="xAOD::JetContainer" - self.AppendToDictionary["AntiKt10TruthBottomUpSoftDropBeta100Zcut5JetsAux"]='xAOD::JetAuxContainer' - items.extend(AntiKt10TruthBottomUpSoftDropBeta100Zcut5JetsCPContent) - elif collectionName=="AntiKt10UFOCSSKBottomUpSoftDropBeta100Zcut5Jets": - from DerivationFrameworkJetEtMiss.AntiKt10UFOCSSKBottomUpSoftDropBeta100Zcut5JetsCPContent import AntiKt10UFOCSSKBottomUpSoftDropBeta100Zcut5JetsCPContent - if "AntiKt10UFOCSSKBottomUpSoftDropBeta100Zcut5Jets" not in self.AppendToDictionary: - self.AppendToDictionary["AntiKt10UFOCSSKBottomUpSoftDropBeta100Zcut5Jets"]='xAOD::JetContainer' - self.AppendToDictionary["AntiKt10UFOCSSKBottomUpSoftDropBeta100Zcut5JetsAux"]='xAOD::JetAuxContainer' - if "AntiKt10TruthBottomUpSoftDropBeta100Zcut5Jets" not in self.AppendToDictionary: - self.AppendToDictionary["AntiKt10TruthBottomUpSoftDropBeta100Zcut5Jets"]="xAOD::JetContainer" - self.AppendToDictionary["AntiKt10TruthBottomUpSoftDropBeta100Zcut5JetsAux"]='xAOD::JetAuxContainer' - items.extend(AntiKt10UFOCSSKBottomUpSoftDropBeta100Zcut5JetsCPContent) - elif collectionName=="AntiKt10TruthRecursiveSoftDropBeta100Zcut5NinfJets": - from DerivationFrameworkJetEtMiss.AntiKt10TruthRecursiveSoftDropBeta100Zcut5NinfJetsCPContent import AntiKt10TruthRecursiveSoftDropBeta100Zcut5NinfJetsCPContent - if "AntiKt10TruthRecursiveSoftDropBeta100Zcut5NinfJets" not in self.AppendToDictionary: - self.AppendToDictionary["AntiKt10TruthRecursiveSoftDropBeta100Zcut5NinfJets"]="xAOD::JetContainer" - self.AppendToDictionary["AntiKt10TruthRecursiveSoftDropBeta100Zcut5NinfJetsAux"]='xAOD::JetAuxContainer' - items.extend(AntiKt10TruthRecursiveSoftDropBeta100Zcut5NinfJetsCPContent) - elif collectionName=="AntiKt10UFOCSSKRecursiveSoftDropBeta100Zcut5NinfJets": - from DerivationFrameworkJetEtMiss.AntiKt10UFOCSSKRecursiveSoftDropBeta100Zcut5NinfJetsCPContent import AntiKt10UFOCSSKRecursiveSoftDropBeta100Zcut5NinfJetsCPContent - if "AntiKt10UFOCSSKRecursiveSoftDropBeta100Zcut5NinfJets" not in self.AppendToDictionary: - self.AppendToDictionary["AntiKt10UFOCSSKRecursiveSoftDropBeta100Zcut5NinfJets"]='xAOD::JetContainer' - self.AppendToDictionary["AntiKt10UFOCSSKRecursiveSoftDropBeta100Zcut5NinfJetsAux"]='xAOD::JetAuxContainer' - if "AntiKt10TruthRecursiveSoftDropBeta100Zcut5NinfJets" not in self.AppendToDictionary: - self.AppendToDictionary["AntiKt10TruthRecursiveSoftDropBeta100Zcut5NinfJets"]="xAOD::JetContainer" - self.AppendToDictionary["AntiKt10TruthRecursiveSoftDropBeta100Zcut5NinfJetsAux"]='xAOD::JetAuxContainer' - items.extend(AntiKt10UFOCSSKRecursiveSoftDropBeta100Zcut5NinfJetsCPContent) elif collectionName=="AntiKt4EMPFlowJets": from DerivationFrameworkJetEtMiss.AntiKt4EMPFlowJetsCPContent import AntiKt4EMPFlowJetsCPContent items.extend(AntiKt4EMPFlowJetsCPContent) @@ -540,30 +465,9 @@ class SlimmingHelper: elif collectionName=="AntiKt8EMTopoJets": from DerivationFrameworkJetEtMiss.AntiKt8EMTopoJetsCPContent import AntiKt8EMTopoJetsCPContent items.extend(AntiKt8EMTopoJetsCPContent) - elif collectionName=="AntiKt8EMTopoExKt2SubJets": - from DerivationFrameworkJetEtMiss.AntiKt8EMTopoExKt2SubJetsCPContent import AntiKt8EMTopoExKt2SubJetsCPContent - items.extend(AntiKt8EMTopoExKt2SubJetsCPContent) - elif collectionName=="AntiKt8EMTopoExKt3SubJets": - from DerivationFrameworkJetEtMiss.AntiKt8EMTopoExKt3SubJetsCPContent import AntiKt8EMTopoExKt3SubJetsCPContent - items.extend(AntiKt8EMTopoExKt3SubJetsCPContent) - elif collectionName=="AntiKt8EMTopoExCoM2SubJets": - from DerivationFrameworkJetEtMiss.AntiKt8EMTopoExCoM2SubJetsCPContent import AntiKt8EMTopoExCoM2SubJetsCPContent - items.extend(AntiKt8EMTopoExCoM2SubJetsCPContent) elif collectionName=="AntiKt8EMPFlowJets": from DerivationFrameworkJetEtMiss.AntiKt8EMPFlowJetsCPContent import AntiKt8EMPFlowJetsCPContent items.extend(AntiKt8EMPFlowJetsCPContent) - elif collectionName=="AntiKt8EMPFlowExKt2SubJets": - from DerivationFrameworkJetEtMiss.AntiKt8EMPFlowExKt2SubJetsCPContent import AntiKt8EMPFlowExKt2SubJetsCPContent - items.extend(AntiKt8EMPFlowExKt2SubJetsCPContent) - elif collectionName=="AntiKt8EMPFlowExKt3SubJets": - from DerivationFrameworkJetEtMiss.AntiKt8EMPFlowExKt3SubJetsCPContent import AntiKt8EMPFlowExKt3SubJetsCPContent - items.extend(AntiKt8EMPFlowExKt3SubJetsCPContent) - elif collectionName=="AntiKt8EMPFlowExKt2GASubJets": - from DerivationFrameworkJetEtMiss.AntiKt8EMPFlowExKt2GASubJetsCPContent import AntiKt8EMPFlowExKt2GASubJetsCPContent - items.extend(AntiKt8EMPFlowExKt2GASubJetsCPContent) - elif collectionName=="AntiKt8EMPFlowExKt3GASubJets": - from DerivationFrameworkJetEtMiss.AntiKt8EMPFlowExKt3GASubJetsCPContent import AntiKt8EMPFlowExKt3GASubJetsCPContent - items.extend(AntiKt8EMPFlowExKt3GASubJetsCPContent) elif collectionName=="AntiKtVR30Rmax4Rmin02PV0TrackJets": from DerivationFrameworkJetEtMiss.AntiKtVR30Rmax4Rmin02PV0TrackJetsCPContent import AntiKtVR30Rmax4Rmin02PV0TrackJetsCPContent items.extend(AntiKtVR30Rmax4Rmin02PV0TrackJetsCPContent) @@ -606,21 +510,6 @@ class SlimmingHelper: elif collectionName=="BTagging_AntiKt8EMPFlowExKt3GASub": from DerivationFrameworkFlavourTag.BTaggingContent import BTaggingExpertContent items.extend(BTaggingExpertContent("AntiKt8EMPFlowExKt3GASubJets")) - elif collectionName=="BTagging_AntiKt10LCTopoTrimmedPtFrac5SmallR20ExKt2Sub_expert": - from DerivationFrameworkFlavourTag.BTaggingContent import BTaggingExpertContent - items.extend(BTaggingExpertContent("AntiKt10LCTopoTrimmedPtFrac5SmallR20ExKt2SubJets")) - elif collectionName=="BTagging_AntiKt10LCTopoTrimmedPtFrac5SmallR20ExKt3Sub_expert": - from DerivationFrameworkFlavourTag.BTaggingContent import BTaggingExpertContent - items.extend(BTaggingExpertContent("AntiKt10LCTopoTrimmedPtFrac5SmallR20ExKt3SubJets")) - elif collectionName=="BTagging_AntiKt10LCTopoTrimmedPtFrac5SmallR20ExKt2GASub_expert": - from DerivationFrameworkFlavourTag.BTaggingContent import BTaggingExpertContent - items.extend(BTaggingExpertContent("AntiKt10LCTopoTrimmedPtFrac5SmallR20ExKt2GASubJets")) - elif collectionName=="BTagging_AntiKt10LCTopoTrimmedPtFrac5SmallR20ExKt3GASub_expert": - from DerivationFrameworkFlavourTag.BTaggingContent import BTaggingExpertContent - items.extend(BTaggingExpertContent("AntiKt10LCTopoTrimmedPtFrac5SmallR20ExKt3GASubJets")) - elif collectionName=="BTagging_AntiKt10LCTopoTrimmedPtFrac5SmallR20ExCoM2Sub_expert": - from DerivationFrameworkFlavourTag.BTaggingContent import BTaggingExpertContent - items.extend(BTaggingExpertContent("AntiKt10LCTopoTrimmedPtFrac5SmallR20ExCoM2SubJets")) elif collectionName=="BTagging_DFAntiKt4HI": from DerivationFrameworkFlavourTag.BTaggingContent import BTaggingStandardContent items.extend(BTaggingStandardContent("DFAntiKt4HIJets")) diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10LCTopoCSSKSoftDropBeta100Zcut10JetsCPContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10LCTopoCSSKSoftDropBeta100Zcut10JetsCPContent.py deleted file mode 100644 index d433103dc00ad8ae4882b137f27f5d418ac11368..0000000000000000000000000000000000000000 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10LCTopoCSSKSoftDropBeta100Zcut10JetsCPContent.py +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration - -AntiKt10LCTopoCSSKSoftDropBeta100Zcut10JetsCPContent = [ -"AntiKt10LCTopoCSSKSoftDropBeta100Zcut10Jets", -"AntiKt10LCTopoCSSKSoftDropBeta100Zcut10JetsAux.JetConstitScaleMomentum_pt.JetConstitScaleMomentum_eta.JetConstitScaleMomentum_phi.JetConstitScaleMomentum_m", -"AntiKt10LCTopoCSSKSoftDropBeta100Zcut10JetsAux.ECF1.ECF2.ECF3.Tau1_wta.Tau2_wta.Tau3_wta.Split12.Split23.Qw.PlanarFlow.FoxWolfram2.FoxWolfram0.Angularity.Aplanarity.KtDR.ZCut12", -"AntiKt10LCTopoCSSKSoftDropBeta100Zcut10JetsAux.Parent.DetectorEta.DetectorY", -"AntiKt10LCTopoCSSKSoftDropBeta100Zcut10JetsAux.R10TruthLabel_R21Consolidated.R10TruthLabel_R21Precision", -] diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthBottomUpSoftDropBeta100Zcut5JetsCPContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthBottomUpSoftDropBeta100Zcut5JetsCPContent.py deleted file mode 100644 index 0e7aacd46df216c56a781fd165f5a52c8d1219af..0000000000000000000000000000000000000000 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthBottomUpSoftDropBeta100Zcut5JetsCPContent.py +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration - -AntiKt10TruthBottomUpSoftDropBeta100Zcut5JetsCPContent = [ -"AntiKt10TruthBottomUpSoftDropBeta100Zcut5Jets", -"AntiKt10TruthBottomUpSoftDropBeta100Zcut5JetsAux.ECF1.ECF2.ECF3.Tau1_wta.Tau2_wta.Tau3_wta.Split12.Split23.Qw.PlanarFlow.FoxWolfram2.FoxWolfram0.Angularity.Aplanarity.KtDR.ZCut12", -"AntiKt10TruthBottomUpSoftDropBeta100Zcut5JetsAux.Parent.GhostBHadronsFinalCount", -"AntiKt10TruthJets", -"AntiKt10TruthJetsAux.GhostBHadronsFinalCount", -] diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthRecursiveSoftDropBeta100Zcut5NinfJetsCPContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthRecursiveSoftDropBeta100Zcut5NinfJetsCPContent.py deleted file mode 100644 index 6fe73478b928accebdf31556cae73b45c78ed28f..0000000000000000000000000000000000000000 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthRecursiveSoftDropBeta100Zcut5NinfJetsCPContent.py +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration - -AntiKt10TruthRecursiveSoftDropBeta100Zcut5NinfJetsCPContent = [ -"AntiKt10TruthRecursiveSoftDropBeta100Zcut5NinfJets", -"AntiKt10TruthRecursiveSoftDropBeta100Zcut5NinfJetsAux.ECF1.ECF2.ECF3.Tau1_wta.Tau2_wta.Tau3_wta.Split12.Split23.Qw.PlanarFlow.FoxWolfram2.FoxWolfram0.Angularity.Aplanarity.KtDR.ZCut12", -"AntiKt10TruthRecursiveSoftDropBeta100Zcut5NinfJetsAux.Parent.GhostBHadronsFinalCount", -"AntiKt10TruthJets", -"AntiKt10TruthJetsAux.GhostBHadronsFinalCount", -] diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10UFOCHSJetsCPContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10UFOCHSJetsCPContent.py index 72c8f9bff136ed3b6a3e880f7931342318937534..33a25b021393e61f2199bc39b4be3f9c1ed45b03 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10UFOCHSJetsCPContent.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10UFOCHSJetsCPContent.py @@ -1,10 +1,10 @@ -# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration AntiKt10UFOCHSJetsCPContent = [ "AntiKt10UFOCHSJets", "AntiKt10UFOCHSJetsAux.JetConstitScaleMomentum_pt.JetConstitScaleMomentum_eta.JetConstitScaleMomentum_phi.JetConstitScaleMomentum_m", "AntiKt10UFOCHSJetsAux.PartonTruthLabelID.DetectorEta.DetectorY", "AntiKt10UFOCHSJetsAux.GhostBHadronsFinalCount.GhostHBosonsCount.GhostTQuarksFinalCount.GhostTrack.GhostWBosonsCount.GhostZBosonsCount", -"AntiKt10UFOCHSJetsAux.GhostVR30Rmax4Rmin02TrackJet.GhostVR30Rmax4Rmin02TrackJetGhostTag.GhostVR30Rmax4Rmin02TrackJet_BTagging201810.GhostVR30Rmax4Rmin02TrackJet_BTagging201810GhostTag.GhostVR30Rmax4Rmin02TrackJet_BTagging201903", +"AntiKt10UFOCHSJetsAux.GhostAntiKtVR30Rmax4Rmin02PV0TrackJets", "AntiKt10UFOCHSJetsAux.HadronConeExclExtendedTruthLabelID.HadronConeExclTruthLabelID.NumTrkPt500.SumPtTrkPt500", ] diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10UFOCHSTrimmedPtFrac5SmallR20JetsCPContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10UFOCHSTrimmedPtFrac5SmallR20JetsCPContent.py deleted file mode 100644 index 15e6bc6ddfa9d96c8cdd6c6ea7172803f7d74179..0000000000000000000000000000000000000000 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10UFOCHSTrimmedPtFrac5SmallR20JetsCPContent.py +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration - -AntiKt10UFOCHSTrimmedPtFrac5SmallR20JetsCPContent = [ -"AntiKt10UFOCHSTrimmedPtFrac5SmallR20Jets", -"AntiKt10UFOCHSTrimmedPtFrac5SmallR20JetsAux.JetConstitScaleMomentum_pt.JetConstitScaleMomentum_eta.JetConstitScaleMomentum_phi.JetConstitScaleMomentum_m", -"AntiKt10UFOCHSTrimmedPtFrac5SmallR20JetsAux.ECF1.ECF2.ECF3.Tau1_wta.Tau2_wta.Tau3_wta.Split12.Split23.Qw.PlanarFlow.FoxWolfram2.FoxWolfram0.Angularity.Aplanarity.KtDR.ZCut12", -"AntiKt10UFOCHSTrimmedPtFrac5SmallR20JetsAux.NTrimSubjets.Parent.DetectorEta.DetectorY", -"AntiKt10UFOCHSTrimmedPtFrac5SmallR20JetsAux.R10TruthLabel_R21Consolidated.R10TruthLabel_R21Precision", -"AntiKt10UFOCHSJets", -"AntiKt10UFOCHSJetsAux.NumTrkPt500", -"AntiKt10TruthTrimmedPtFrac5SmallR20Jets.pt.eta.phi.m.ECF1.ECF2.ECF3.Tau2_wta.Tau3_wta.Qw.GhostBHadronsFinalCount", -] diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10UFOCSSKBottomUpSoftDropBeta100Zcut5JetsCPContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10UFOCSSKBottomUpSoftDropBeta100Zcut5JetsCPContent.py deleted file mode 100644 index 5efa31bcb28196095047a27f1d78d7a2ac122b7a..0000000000000000000000000000000000000000 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10UFOCSSKBottomUpSoftDropBeta100Zcut5JetsCPContent.py +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration - -AntiKt10UFOCSSKBottomUpSoftDropBeta100Zcut5JetsCPContent = [ -"AntiKt10UFOCSSKBottomUpSoftDropBeta100Zcut5Jets", -"AntiKt10UFOCSSKBottomUpSoftDropBeta100Zcut5JetsAux.JetConstitScaleMomentum_pt.JetConstitScaleMomentum_eta.JetConstitScaleMomentum_phi.JetConstitScaleMomentum_m", -"AntiKt10UFOCSSKBottomUpSoftDropBeta100Zcut5JetsAux.ECF1.ECF2.ECF3.Tau1_wta.Tau2_wta.Tau3_wta.Split12.Split23.Qw.PlanarFlow.FoxWolfram2.FoxWolfram0.Angularity.Aplanarity.KtDR.ZCut12", -"AntiKt10UFOCSSKBottomUpSoftDropBeta100Zcut5JetsAux.Parent.DetectorEta.DetectorY", -"AntiKt10UFOCSSKBottomUpSoftDropBeta100Zcut5JetsAux.R10TruthLabel_R21Consolidated.R10TruthLabel_R21Precision", -"AntiKt10UFOCSSKJets", -"AntiKt10UFOCSSKJetsAux.NumTrkPt500", -"AntiKt10TruthBottomUpSoftDropBeta100Zcut5Jets.pt.eta.phi.m.ECF1.ECF2.ECF3.Tau2_wta.Tau3_wta.Qw.GhostBHadronsFinalCount", -] diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10UFOCSSKJetsCPContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10UFOCSSKJetsCPContent.py index 1cb9c1ad2e1b229177b16a21863eae03b72241d2..19809b2ee81306174c9b6c4cefefec628407d386 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10UFOCSSKJetsCPContent.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10UFOCSSKJetsCPContent.py @@ -1,10 +1,10 @@ -# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration AntiKt10UFOCSSKJetsCPContent = [ "AntiKt10UFOCSSKJets", "AntiKt10UFOCSSKJetsAux.JetConstitScaleMomentum_pt.JetConstitScaleMomentum_eta.JetConstitScaleMomentum_phi.JetConstitScaleMomentum_m", "AntiKt10UFOCSSKJetsAux.PartonTruthLabelID.DetectorEta.DetectorY", "AntiKt10UFOCSSKJetsAux.GhostBHadronsFinalCount.GhostHBosonsCount.GhostTQuarksFinalCount.GhostTrack.GhostWBosonsCount.GhostZBosonsCount", -"AntiKt10UFOCSSKJetsAux.GhostVR30Rmax4Rmin02TrackJet.GhostVR30Rmax4Rmin02TrackJetGhostTag.GhostVR30Rmax4Rmin02TrackJet_BTagging201810.GhostVR30Rmax4Rmin02TrackJet_BTagging201810GhostTag.GhostVR30Rmax4Rmin02TrackJet_BTagging201903", +"AntiKt10UFOCSSKJetsAux.GhostAntiKtVR30Rmax4Rmin02PV0TrackJets", "AntiKt10UFOCSSKJetsAux.HadronConeExclExtendedTruthLabelID.HadronConeExclTruthLabelID.NumTrkPt500.SumPtTrkPt500", ] diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10UFOCSSKRecursiveSoftDropBeta100Zcut5NinfJetsCPContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10UFOCSSKRecursiveSoftDropBeta100Zcut5NinfJetsCPContent.py deleted file mode 100644 index 390c8d28f1270cbed55df3749d9af9e9bf5cb276..0000000000000000000000000000000000000000 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10UFOCSSKRecursiveSoftDropBeta100Zcut5NinfJetsCPContent.py +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration - -AntiKt10UFOCSSKRecursiveSoftDropBeta100Zcut5NinfJetsCPContent = [ -"AntiKt10UFOCSSKRecursiveSoftDropBeta100Zcut5NinfJets", -"AntiKt10UFOCSSKRecursiveSoftDropBeta100Zcut5NinfJetsAux.JetConstitScaleMomentum_pt.JetConstitScaleMomentum_eta.JetConstitScaleMomentum_phi.JetConstitScaleMomentum_m", -"AntiKt10UFOCSSKRecursiveSoftDropBeta100Zcut5NinfJetsAux.ECF1.ECF2.ECF3.Tau1_wta.Tau2_wta.Tau3_wta.Split12.Split23.Qw.PlanarFlow.FoxWolfram2.FoxWolfram0.Angularity.Aplanarity.KtDR.ZCut12", -"AntiKt10UFOCSSKRecursiveSoftDropBeta100Zcut5NinfJetsAux.Parent.DetectorEta.DetectorY", -"AntiKt10UFOCSSKRecursiveSoftDropBeta100Zcut5NinfJetsAux.R10TruthLabel_R21Consolidated.R10TruthLabel_R21Precision", -"AntiKt10UFOCSSKJets", -"AntiKt10UFOCSSKJetsAux.NumTrkPt500", -"AntiKt10TruthRecursiveSoftDropBeta100Zcut5NinfJets.pt.eta.phi.m.ECF1.ECF2.ECF3.Tau2_wta.Tau3_wta.Qw.GhostBHadronsFinalCount", -] diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10UFOCSSKTrimmedPtFrac5SmallR20JetsCPContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10UFOCSSKTrimmedPtFrac5SmallR20JetsCPContent.py deleted file mode 100644 index 3876891fa3e031a5339981f7f887ef6acb3b3a7d..0000000000000000000000000000000000000000 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10UFOCSSKTrimmedPtFrac5SmallR20JetsCPContent.py +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration - -AntiKt10UFOCSSKTrimmedPtFrac5SmallR20JetsCPContent = [ -"AntiKt10UFOCSSKTrimmedPtFrac5SmallR20Jets", -"AntiKt10UFOCSSKTrimmedPtFrac5SmallR20JetsAux.JetConstitScaleMomentum_pt.JetConstitScaleMomentum_eta.JetConstitScaleMomentum_phi.JetConstitScaleMomentum_m", -"AntiKt10UFOCSSKTrimmedPtFrac5SmallR20JetsAux.ECF1.ECF2.ECF3.Tau1_wta.Tau2_wta.Tau3_wta.Split12.Split23.Qw.PlanarFlow.FoxWolfram2.FoxWolfram0.Angularity.Aplanarity.KtDR.ZCut12", -"AntiKt10UFOCSSKTrimmedPtFrac5SmallR20JetsAux.NTrimSubjets.Parent.DetectorEta.DetectorY", -"AntiKt10UFOCSSKTrimmedPtFrac5SmallR20JetsAux.R10TruthLabel_R21Consolidated.R10TruthLabel_R21Precision", -"AntiKt10UFOCSSKJets", -"AntiKt10UFOCSSKJetsAux.NumTrkPt500", -"AntiKt10TruthTrimmedPtFrac5SmallR20Jets.pt.eta.phi.m.ECF1.ECF2.ECF3.Tau2_wta.Tau3_wta.Qw.GhostBHadronsFinalCount", -] diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt8EMPFlowExKt2GASubJetsCPContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt8EMPFlowExKt2GASubJetsCPContent.py deleted file mode 100644 index 43bee234718b3e08d764f0dbfead2701cb6ad999..0000000000000000000000000000000000000000 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt8EMPFlowExKt2GASubJetsCPContent.py +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration - -AntiKt8EMPFlowExKt2GASubJetsCPContent = [ -"AntiKt8EMPFlowExKt2GASubJets", -"AntiKt8EMPFlowExKt2GASubJetsAux.pt.eta.phi.m", -] diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt8EMPFlowExKt2SubJetsCPContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt8EMPFlowExKt2SubJetsCPContent.py deleted file mode 100644 index 2144e99039121209812d97e5442bc5059ed8af17..0000000000000000000000000000000000000000 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt8EMPFlowExKt2SubJetsCPContent.py +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration - -AntiKt8EMPFlowExKt2SubJetsCPContent = [ -"AntiKt8EMPFlowExKt2SubJets", -"AntiKt8EMPFlowExKt2SubJetsAux.pt.eta.phi.m", -] diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt8EMPFlowExKt3GASubJetsCPContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt8EMPFlowExKt3GASubJetsCPContent.py deleted file mode 100644 index 16e8ad9de2806d504926a48319a59ae26e52e5e0..0000000000000000000000000000000000000000 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt8EMPFlowExKt3GASubJetsCPContent.py +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration - -AntiKt8EMPFlowExKt3GASubJetsCPContent = [ -"AntiKt8EMPFlowExKt3GASubJets", -"AntiKt8EMPFlowExKt3GASubJetsAux.pt.eta.phi.m", -] diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt8EMPFlowExKt3SubJetsCPContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt8EMPFlowExKt3SubJetsCPContent.py deleted file mode 100644 index eb3a376c11c7e8086f68edf5b43b12b1f2c87973..0000000000000000000000000000000000000000 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt8EMPFlowExKt3SubJetsCPContent.py +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration - -AntiKt8EMPFlowExKt3SubJetsCPContent = [ -"AntiKt8EMPFlowExKt3SubJets", -"AntiKt8EMPFlowExKt3SubJetsAux.pt.eta.phi.m", -] diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt8EMTopoExKt2SubJetsCPContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt8EMTopoExKt2SubJetsCPContent.py deleted file mode 100644 index 431526d5074ce8954dfa2be5c2f22031eb019386..0000000000000000000000000000000000000000 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt8EMTopoExKt2SubJetsCPContent.py +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration - -AntiKt8EMTopoExKt2SubJetsCPContent = [ -"AntiKt8EMTopoExKt2SubJets", -"AntiKt8EMTopoExKt2SubJetsAux.pt.eta.phi.m", -] diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt8EMTopoExKt3SubJetsCPContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt8EMTopoExKt3SubJetsCPContent.py deleted file mode 100644 index 45eb8d5a70d4005a2c981dc28a354cb303b71193..0000000000000000000000000000000000000000 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt8EMTopoExKt3SubJetsCPContent.py +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration - -AntiKt8EMTopoExKt3SubJetsCPContent = [ -"AntiKt8EMTopoExKt3SubJets", -"AntiKt8EMTopoExKt3SubJetsAux.pt.eta.phi.m", -] diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/METTriggerDerivationContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/METTriggerDerivationContent.py index d4fb08f284d085b2047569907e2331188688d1c2..b17ac4ea48747b4391190f0a794224f459f1cea2 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/METTriggerDerivationContent.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/METTriggerDerivationContent.py @@ -82,14 +82,13 @@ class METTriggerDerivationContentManager(object): self.slimming_helper = SlimmingHelper(self.stream_name + "SlimmingHelper") smart_collections = ["Electrons", "Muons", "Photons", "TauJets", "PrimaryVertices", "InDetTrackParticles"] smart_collections += ["{0}Jets".format(a) for a in jet_algorithms] - smart_collections += ["MET_Reference_{0}".format(a) for a in jet_algorithms] + smart_collections += ["MET_Baseline_{0}".format(a) for a in jet_algorithms] if "AntiKt4EMTopo" in jet_algorithms: smart_collections += [ - "AntiKt4EMTopoJets_BTagging201810", "BTagging_AntiKt4EMTopo_201810"] + "BTagging_AntiKt4EMTopo"] if "AntiKt4EMPFlow" in jet_algorithms: smart_collections += [ - "AntiKt4EMPFlowJets_BTagging201810", "BTagging_AntiKt4EMPFlow_201810", - "AntiKt4EMPFlowJets_BTagging201903", "BTagging_AntiKt4EMPFlow_201903"] + "BTagging_AntiKt4EMPFlow"] self.slimming_helper.SmartCollections = smart_collections self.slimming_helper.ExtraVariables = [ "{0}Jets.Timing".format(a) for a in jet_algorithms] diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/MET_Reference_AntiKt4EMPFlowCPContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/MET_Reference_AntiKt4EMPFlowCPContent.py deleted file mode 100644 index c8318da9b24904416c81f807ee40e4a61f87e49d..0000000000000000000000000000000000000000 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/MET_Reference_AntiKt4EMPFlowCPContent.py +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration - -MET_Reference_AntiKt4EMPFlowCPContent = [ -"AntiKt4EMPFlowJets", -"AntiKt4EMPFlowJetsAux.pt.eta.phi.m.JetConstitScaleMomentum_pt.JetConstitScaleMomentum_eta.JetConstitScaleMomentum_phi.JetConstitScaleMomentum_m.GhostTrack.NumTrkPt500.SumPtTrkPt500.Width.EMFrac.EnergyPerSampling", -"Electrons", -"InDetTrackParticles", -"METAssoc_AntiKt4EMPFlow", -"METAssoc_AntiKt4EMPFlowAux.", -#"METAssoc_AntiKt4EMPFlowAux.jetLink.objectLinks.calkey.calpx.calpy.calpz.cale.calsumpt.trkkey.trkpx.trkpy.trkpz.trke.trksumpt.jettrkpx.jettrkpy.jettrkpz.jettrke.jettrksumpt.overlapIndices.overlapTypes.isMisc", -"MET_Core_AntiKt4EMPFlow", -"MET_Core_AntiKt4EMPFlowAux.name.mpx.mpy.sumet.source", -"MET_Reference_AntiKt4EMPFlow", -"MET_Reference_AntiKt4EMPFlowAux.name.mpx.mpy.sumet.source", -"MET_Truth", -"MET_TruthAux.name.mpx.mpy.sumet.source", -"Muons", -"MuonsAux.EnergyLoss.energyLossType.muonType", -"Photons", -"TauJets", -#"PrimaryVertices", -#"PrimaryVerticesAux.vertexType.trackParticleLinks" -] diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/MET_Reference_AntiKt4EMTopoCPContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/MET_Reference_AntiKt4EMTopoCPContent.py deleted file mode 100644 index d7e9ede32acf8162621927e6ee938ae7a191dccb..0000000000000000000000000000000000000000 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/MET_Reference_AntiKt4EMTopoCPContent.py +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration - -MET_Reference_AntiKt4EMTopoCPContent = [ -"AntiKt4EMTopoJets", -"AntiKt4EMTopoJetsAux.pt.eta.phi.m.JetConstitScaleMomentum_pt.JetConstitScaleMomentum_eta.JetConstitScaleMomentum_phi.JetConstitScaleMomentum_m.GhostTrack.NumTrkPt500.SumPtTrkPt500.Width.EMFrac.EnergyPerSampling", -"Electrons", -"InDetTrackParticles", -"METAssoc_AntiKt4EMTopo", -"METAssoc_AntiKt4EMTopoAux.", -#"METAssoc_AntiKt4EMTopoAux.jetLink.objectLinks.calkey.calpx.calpy.calpz.cale.calsumpt.trkkey.trkpx.trkpy.trkpz.trke.trksumpt.jettrkpx.jettrkpy.jettrkpz.jettrke.jettrksumpt.overlapIndices.overlapTypes.isMisc", -"MET_Core_AntiKt4EMTopo", -"MET_Core_AntiKt4EMTopoAux.name.mpx.mpy.sumet.source", -"MET_Reference_AntiKt4EMTopo", -"MET_Reference_AntiKt4EMTopoAux.name.mpx.mpy.sumet.source", -"MET_Truth", -"MET_TruthAux.name.mpx.mpy.sumet.source", -"Muons", -"MuonsAux.EnergyLoss.energyLossType.muonType", -"Photons", -"TauJets", -#"PrimaryVertices", -#"PrimaryVerticesAux.vertexType.trackParticleLinks", -] diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/MET_Reference_AntiKt4LCTopoCPContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/MET_Reference_AntiKt4LCTopoCPContent.py deleted file mode 100644 index 80c807035bd238e416d1a7087101462e4cb7f6a8..0000000000000000000000000000000000000000 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/MET_Reference_AntiKt4LCTopoCPContent.py +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration - -MET_Reference_AntiKt4LCTopoCPContent = [ -"AntiKt4LCTopoJets", -"AntiKt4LCTopoJetsAux.pt.eta.phi.m.JetConstitScaleMomentum_pt.JetConstitScaleMomentum_eta.JetConstitScaleMomentum_phi.JetConstitScaleMomentum_m.GhostTrack.NumTrkPt500.SumPtTrkPt500.Width.EMFrac.EnergyPerSampling", -"Electrons", -"InDetTrackParticles", -"METAssoc_AntiKt4LCTopo", -"METAssoc_AntiKt4LCTopoAux.", -#"METAssoc_AntiKt4LCTopoAux.jetLink.objectLinks.calkey.calpx.calpy.calpz.cale.calsumpt.trkkey.trkpx.trkpy.trkpz.trke.trksumpt.jettrkpx.jettrkpy.jettrkpz.jettrke.jettrksumpt.overlapIndices.overlapTypes.isMisc", -"MET_Core_AntiKt4LCTopo", -"MET_Core_AntiKt4LCTopoAux.name.mpx.mpy.sumet.source", -"MET_Reference_AntiKt4LCTopo", -"MET_Reference_AntiKt4LCTopoAux.name.mpx.mpy.sumet.source", -"MET_Truth", -"MET_TruthAux.name.mpx.mpy.sumet.source", -"Muons", -"MuonsAux.EnergyLoss.energyLossType.muonType", -"Photons", -"TauJets", -#"PrimaryVertices", -#"PrimaryVerticesAux.vertexType.trackParticleLinks" -] diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM1.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM1.py index 604cfe8e011a8a35855bd23a77a336ff1a81ba99..0308f92faabb6cd60a071f08e6bf6065d4f76f7b 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM1.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM1.py @@ -167,7 +167,7 @@ JETM1SlimmingHelper.ExtraVariables = ["AntiKt4EMTopoJets.DFCommonJets_QGTagger_ "AntiKt10UFOCSSKSoftDropBeta100Zcut10Jets.zg.rg.NumTrkPt1000.TrackWidthPt1000.GhostMuonSegmentCount.EnergyPerSampling.GhostTrack", "AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets.zg.rg", "AntiKt10UFOCSSKJets.NumTrkPt1000.TrackWidthPt1000.GhostMuonSegmentCount.EnergyPerSampling.GhostTrack", - "TruthVertices.z"] + "TruthVertices.barcode.z"] JETM1SlimmingHelper.AllVariables = [ "MuonSegments", "EventInfo", "TruthParticles", "AntiKt4TruthJets", "InTimeAntiKt4TruthJets", "OutOfTimeAntiKt4TruthJets", diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM12.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM12.py index 844e58a68fe0facc1a9eb52edbf1e9026f9e542c..bbeecad1eb4540b59956ade30eb989f32d786970 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM12.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM12.py @@ -6,7 +6,6 @@ from DerivationFrameworkCore.DerivationFrameworkMaster import DerivationFrameworkIsMonteCarlo, DerivationFrameworkJob, buildFileName from DerivationFrameworkJetEtMiss.JetCommon import OutputJets -# #==================================================================== # SKIMMING TOOL @@ -20,7 +19,7 @@ andstr = ' && ' trackRequirements = '(InDetTrackParticles.pt > 10.*GeV && InDetTrackParticles.TrkIsoPt1000_ptcone20 < 0.12*InDetTrackParticles.pt && InDetTrackParticles.DFCommonTightPrimary && abs(DFCommonInDetTrackZ0AtPV) < 3.0*mm )' trackRequirementsMu = '(InDetTrackParticles.pt > 70.*GeV && InDetTrackParticles.TrkIsoPt1000_ptcone20 < 0.12*InDetTrackParticles.pt && InDetTrackParticles.DFCommonTightPrimary && abs(DFCommonInDetTrackZ0AtPV) < 3.0*mm )' trackRequirementsTtbar = '(InDetTrackParticles.pt > 25.*GeV && InDetTrackParticles.TrkIsoPt1000_ptcone20 < 0.12*InDetTrackParticles.pt && InDetTrackParticles.DFCommonTightPrimary && abs(DFCommonInDetTrackZ0AtPV) < 3.0*mm )' -jetRequirementsTtbar = '( AntiKt4EMTopoJets.DFCommonJets_Calib_pt > 20*GeV && BTagging_AntiKt4EMTopo_201810.MV2c10_discriminant > 0.11 )' +jetRequirementsTtbar = '( AntiKt4EMTopoJets.pt > 20*GeV && BTagging_AntiKt4EMTopo.MV2c10_discriminant > 0.11 )' expressionW = '( (' + orstr.join(metTriggers) + ' )' + andstr + '( count('+trackRequirements+') >=1 ) )' expressionMu = '( (' + orstr.join(muTriggers) + ' )' + andstr + '( count('+trackRequirementsMu+') >=1 ) )' expressionTtbar = '( (' + orstr.join(muTriggers) + ' )' + andstr + '( count('+trackRequirementsTtbar+') >=1 )' + andstr + '( count('+trackRequirements+') >=2 )' + andstr + '( count('+jetRequirementsTtbar+') >=1 ) )' @@ -217,15 +216,11 @@ from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper JETM12SlimmingHelper = SlimmingHelper("JETM12SlimmingHelper") JETM12SlimmingHelper.SmartCollections = ["Electrons", "Photons", "Muons", "TauJets", "InDetTrackParticles", "PrimaryVertices", - "MET_Reference_AntiKt4EMTopo", - "MET_Reference_AntiKt4EMPFlow", + "MET_Baseline_AntiKt4EMTopo", + "MET_Baseline__AntiKt4EMPFlow", "AntiKt4EMTopoJets","AntiKt4EMPFlowJets","AntiKt4TruthJets", - "AntiKt4EMPFlowJets_BTagging201810", - "AntiKt4EMPFlowJets_BTagging201903", - "AntiKt4EMTopoJets_BTagging201810", - "BTagging_AntiKt4EMPFlow_201810", - "BTagging_AntiKt4EMPFlow_201903", - "BTagging_AntiKt4EMTopo_201810", + "BTagging_AntiKt4EMPFlow", + "BTagging_AntiKt4EMTopo", ] JETM12SlimmingHelper.AllVariables = ["MuonTruthParticles","TruthParticles", "TruthVertices", "MuonSegments","InDetTrackParticles", diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM13.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM13.py index eaf751c814d5429b84160a4c9997c7a8b4d65ab6..041f4e5664588bf781456bda288719cd3158c00e 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM13.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM13.py @@ -81,8 +81,8 @@ from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper JETM13SlimmingHelper = SlimmingHelper("JETM13SlimmingHelper") JETM13SlimmingHelper.SmartCollections = ["Electrons", "Photons", "Muons", "TauJets", "InDetTrackParticles", "PrimaryVertices", - "MET_Reference_AntiKt4EMTopo", - "MET_Reference_AntiKt4EMPFlow", + "MET_Baseline_AntiKt4EMTopo", + "MET_Baseline_AntiKt4EMPFlow", "AntiKt4EMTopoJets","AntiKt4EMPFlowJets", "AntiKt4TruthJets","AntiKt10TruthJets", ] diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM15.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM15.py index e706c526cab4f65911aee2a05e934cd865543c27..f7deadb65f4c026716da803baf6066283081ddbd 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM15.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM15.py @@ -375,18 +375,13 @@ JETM15SlimmingHelper.SmartCollections = [ "Muons", "InDetTrackParticles", "PrimaryVertices", - "MET_Reference_AntiKt4EMTopo", - "MET_Reference_AntiKt4EMPFlow", + "MET_Baseline_AntiKt4EMTopo", + "MET_Baseline_AntiKt4EMPFlow", "AntiKt4EMTopoJets", "AntiKt4EMPFlowJets", - "AntiKt4EMPFlowJets_BTagging201810", - "AntiKt4EMPFlowJets_BTagging201903", - "AntiKt4EMTopoJets_BTagging201810", - "BTagging_AntiKt4EMPFlow_201810", - "BTagging_AntiKt4EMPFlow_201903", - "BTagging_AntiKt4EMTopo_201810", - "BTagging_AntiKtVR30Rmax4Rmin02Track_201810", - "BTagging_AntiKtVR30Rmax4Rmin02Track_201903", + "BTagging_AntiKt4EMPFlow", + "BTagging_AntiKt4EMTopo", + "BTagging_AntiKtVR30Rmax4Rmin02Track", "AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets" ] diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM3.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM3.py index 9d4d5997a7cbed8ba39c079ffcece9a7ff970ea1..c838c7c0be3f45e047da2cb9063cc108b55e4853 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM3.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM3.py @@ -6,16 +6,14 @@ from DerivationFrameworkCore.DerivationFrameworkMaster import DerivationFrameworkIsMonteCarlo, DerivationFrameworkJob, buildFileName from DerivationFrameworkJetEtMiss.JetCommon import OutputJets, addJetOutputs, addDAODJets from JetRecConfig.StandardSmallRJets import AntiKt4EMPFlowLowPt, AntiKt4EMTopoLowPt -# from DerivationFrameworkJetEtMiss.METCommon import addMETTruthMap, scheduleMETAssocAlg, addMETOutputs -# + if DerivationFrameworkIsMonteCarlo: from DerivationFrameworkMCTruth.MCTruthCommon import addStandardTruthContents addStandardTruthContents() from DerivationFrameworkPhys import PhysCommon - -# + #==================================================================== # SKIMMING TOOL #==================================================================== @@ -68,7 +66,6 @@ JETM3Stream.AcceptAlgs(["JETM3Kernel"]) from DerivationFrameworkCore.ThinningHelper import ThinningHelper JETM3ThinningHelper = ThinningHelper( "JETM3ThinningHelper" ) -# JETM3ThinningHelper.TriggerChains = orstr.join(electronTriggers+muonTriggers) JETM3ThinningHelper.AppendToStream( JETM3Stream ) #==================================================================== @@ -104,10 +101,11 @@ thinningTools.append(JETM3PhotonTPThinningTool) # TrackParticles associated with taus from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__TauTrackParticleThinning -JETM3TauTPThinningTool = DerivationFramework__TauTrackParticleThinning( name = "JETM3TauTPThinningTool", - StreamName = streamName, - TauKey = "TauJets", - InDetTrackParticlesKey = "InDetTrackParticles") +JETM3TauTPThinningTool = DerivationFramework__TauTrackParticleThinning( name = "JETM3TauTPThinningTool", + StreamName = streamName, + TauKey = "TauJets", + InDetTrackParticlesKey = "InDetTrackParticles") + ToolSvc += JETM3TauTPThinningTool thinningTools.append(JETM3TauTPThinningTool) @@ -120,7 +118,6 @@ JETM3TPThinningTool = DerivationFramework__TrackParticleThinning( name ToolSvc += JETM3TPThinningTool thinningTools.append(JETM3TPThinningTool) - # Truth particle thinning doTruthThinning = True preserveAllDescendants = False @@ -162,12 +159,6 @@ jetm3Seq += CfgMgr.DerivationFramework__DerivationKernel( name = "JETM3Kernel", ThinningTools = thinningTools, AugmentationTools = [TrigMatchAug]) -OutputJets["JETM3"] = ["AntiKt4EMPFlowLowPtJets","AntiKt4EMTopoLowPtJets"] - -#======================================= -# Add. small-R jet stuff in derivations -#======================================= - #======================================= # SCHEDULE SMALL-R JETS WITH LOW PT CUT #======================================= @@ -175,6 +166,7 @@ OutputJets["JETM3"] = ["AntiKt4EMPFlowLowPtJets","AntiKt4EMTopoLowPtJets"] jetList = [AntiKt4EMPFlowLowPt, AntiKt4EMTopoLowPt] addDAODJets(jetList,DerivationFrameworkJob) +OutputJets["JETM3"] = ["AntiKt4EMPFlowLowPtJets","AntiKt4EMTopoLowPtJets"] #======================================= # SCHEDULE CUSTOM MET RECONSTRUCTION @@ -196,10 +188,16 @@ applyPFOAugmentation(DerivationFrameworkJob) #==================================================================== from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper JETM3SlimmingHelper = SlimmingHelper("JETM3SlimmingHelper") + +JETM3SlimmingHelper.AppendToDictionary = {'GlobalChargedParticleFlowObjects':'xAOD::FlowElementContainer','GlobalChargedParticleFlowObjectsAux':'xAOD::FlowElementAuxContainer', + 'GlobalNeutralParticleFlowObjects':'xAOD::FlowElementContainer', 'GlobalNeutralParticleFlowObjectsAux':'xAOD::FlowElementAuxContainer', + 'CHSGChargedParticleFlowObjects':'xAOD::FlowElementContainer','CHSGChargedParticleFlowObjectsAux':'xAOD::ShallowAuxContainer', + 'CHSGNeutralParticleFlowObjects':'xAOD::FlowElementContainer','CHSGNeutralParticleFlowObjectsAux':'xAOD::ShallowAuxContainer'} + JETM3SlimmingHelper.SmartCollections = ["Electrons", "Photons", "Muons", "TauJets", "InDetTrackParticles", "PrimaryVertices", - "MET_Reference_AntiKt4EMTopo", - "MET_Reference_AntiKt4EMPFlow", + "MET_Baseline_AntiKt4EMTopo", + "MET_Baseline_AntiKt4EMPFlow", "AntiKt4EMPFlowJets", "AntiKt4EMTopoJets", "AntiKt4TruthWZJets", @@ -210,18 +208,17 @@ JETM3SlimmingHelper.SmartCollections = ["Electrons", "Photons", "Muons", "TauJet "BTagging_AntiKt4EMPFlow", "BTagging_AntiKt4EMTopo", ] + JETM3SlimmingHelper.AllVariables = ["CaloCalTopoClusters", - "CHSChargedParticleFlowObjects", "CHSNeutralParticleFlowObjects", + "GlobalChargedParticleFlowObjects", "GlobalNeutralParticleFlowObjects", + "CHSGChargedParticleFlowObjects", "CHSGNeutralParticleFlowObjects", "MuonTruthParticles", "egammaTruthParticles", "TruthParticles", "TruthEvents", "TruthVertices", "MuonSegments", "LVL1JetRoIs", - "JetETMissChargedParticleFlowObjects", - "JetETMissNeutralParticleFlowObjects", "Kt4EMTopoOriginEventShape","Kt4EMPFlowEventShape", ] -JETM3SlimmingHelper.AppendToDictionary = {'CHSChargedParticleFlowObjects': 'xAOD::FlowElementContainer', 'CHSChargedParticleFlowObjectsAux':'xAOD::ShallowAuxContainer', - 'CHSNeutralParticleFlowObjects': 'xAOD::FlowElementContainer', 'CHSNeutralParticleFlowObjectsAux':'xAOD::ShallowAuxContainer'} + 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', 'HLT_xAOD__JetContainer_a4tcemsubjesISFS.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', @@ -233,7 +230,6 @@ for truthc in [ "TruthElectrons", "TruthPhotons", "TruthTaus", -# "TruthNeutrinos" ]: JETM3SlimmingHelper.StaticContent.append("xAOD::TruthParticleContainer#"+truthc) JETM3SlimmingHelper.StaticContent.append("xAOD::TruthParticleAuxContainer#"+truthc+"Aux.") diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM4.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM4.py index c81ff570e5d7975a9ce224edd1ea60c68ee9af16..e98aaf8f50e26e69bea5e0014b0b957b8bdbacf4 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM4.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM4.py @@ -175,8 +175,8 @@ from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper JETM4SlimmingHelper = SlimmingHelper("JETM4SlimmingHelper") JETM4SlimmingHelper.SmartCollections = ["Electrons", "Photons", "Muons", "TauJets", "InDetTrackParticles", "PrimaryVertices", - "MET_Reference_AntiKt4EMTopo", - "MET_Reference_AntiKt4EMPFlow", + "MET_Baseline_AntiKt4EMTopo", + "MET_Baseline_AntiKt4EMPFlow", "AntiKt4EMPFlowJets", "AntiKt4EMTopoJets", "AntiKt10TruthJets", diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM5.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM5.py index b9e544a849bbcb8d9b0338076f631319625a2189..9ab5622508f43c2abcbb23e51cad51ef6fcb4977 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM5.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM5.py @@ -127,9 +127,6 @@ FlavorTagInit(JetCollections = ['AntiKt4EMPFlowJets'],Sequencer = jetm5Seq) addQGTaggerTool(jetalg="AntiKt4EMTopo", sequence=jetm5Seq, algname="QGTaggerToolAlg") addQGTaggerTool(jetalg="AntiKt4EMPFlow", sequence=jetm5Seq, algname="QGTaggerToolAlg") -# MVfJvt # -applyMVfJvtAugmentation(jetalg='AntiKt4EMTopo',sequence=jetm5Seq, algname='JetForwardJvtToolBDTAlg') - # PFlow fJvt # getPFlowfJVT(jetalg='AntiKt4EMPFlow',sequence=jetm5Seq, algname='JetForwardPFlowJvtToolAlg',includePV=False) getPFlowfJVT(jetalg='AntiKt4EMPFlow',sequence=jetm5Seq, algname='JetForwardPFlowJvtToolAlgNew',outLabel="fJvtWithPV",includePV=True) @@ -141,21 +138,16 @@ from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper JETM5SlimmingHelper = SlimmingHelper("JETM5SlimmingHelper") JETM5SlimmingHelper.SmartCollections = ["Electrons", "Photons", "Muons", "TauJets", "InDetTrackParticles", "PrimaryVertices", - "MET_Reference_AntiKt4EMTopo", - "MET_Reference_AntiKt4LCTopo", - "MET_Reference_AntiKt4EMPFlow", - "AntiKt4EMTopoJets","AntiKt4LCTopoJets","AntiKt4EMPFlowJets", - "AntiKt4EMPFlowJets_BTagging201810", - "AntiKt4EMPFlowJets_BTagging201903", - "AntiKt4EMTopoJets_BTagging201810", - "BTagging_AntiKt4EMPFlow_201810", - "BTagging_AntiKt4EMPFlow_201903", - "BTagging_AntiKt4EMTopo_201810"] + "MET_Baseline_AntiKt4EMTopo", + "MET_Baseline_AntiKt4EMPFlow", + "AntiKt4EMTopoJets","AntiKt4EMPFlowJets", + "BTagging_AntiKt4EMPFlow", + "BTagging_AntiKt4EMTopo"] JETM5SlimmingHelper.AllVariables = ["CaloCalTopoClusters", "MuonTruthParticles", "egammaTruthParticles", "TruthParticles", "TruthEvents", "TruthVertices", "MuonSegments", - "Kt4EMTopoOriginEventShape","Kt4LCTopoOriginEventShape","Kt4EMPFlowEventShape", + "Kt4EMTopoOriginEventShape","Kt4EMPFlowEventShape", ] JETM5SlimmingHelper.ExtraVariables = ["JetETMissNeutralParticleFlowObjects.m.mEM.pfo_TrackLinks.eflowRec_ISOLATION.pfo_ClusterLinks.eflowRec_TIMING.eflowRec_AVG_LAR_Q.eflowRec_EM_PROBABILITY.eflowRec_CENTER_LAMBDA.centerMag.pt.ptEM.phi.eta", "JetETMissChargedParticleFlowObjects.pt.eta.phi.m.eflowRec_tracksExpectedEnergyDeposit.pfo_vertex.charge.eflowRec_isInDenseEnvironment.pfo_TrackLinks.DFCommonPFlow_z0.DFCommonPFlow_vz.DFCommonPFlow_d0.DFCommonPFlow_theta.DFCommonPFlow_envWeight",] @@ -180,6 +172,6 @@ for truthc in [ # Add the jet containers to the stream addJetOutputs(JETM5SlimmingHelper,["SmallR"]) # Add the MET containers to the stream -addMETOutputs(JETM5SlimmingHelper,["Diagnostic","AntiKt4LCTopo","AntiKt4EMPFlow","Track"]) +addMETOutputs(JETM5SlimmingHelper,["Diagnostic","AntiKt4EMTopo","AntiKt4EMPFlow","Track"]) JETM5SlimmingHelper.AppendContentToStream(JETM5Stream) diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM6.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM6.py index 1bcf11aa101486f273317c921e72e4d4e6a60888..0c8e68b682c2a162651fc36ff7776cbf1494365d 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM6.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM6.py @@ -274,17 +274,13 @@ JETM6SlimmingHelper.SmartCollections = ["Electrons", "TauJets", "InDetTrackParticles", "PrimaryVertices", - "MET_Reference_AntiKt4EMTopo", - "MET_Reference_AntiKt4EMPFlow", + "MET_Baseline_AntiKt4EMTopo", + "MET_Baseline_AntiKt4EMPFlow", "AntiKt2TruthJets", "AntiKt2LCTopoJets", "AntiKt4EMTopoJets","AntiKt4EMPFlowJets","AntiKt4TruthJets", "AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets", - "AntiKt10UFOCHSTrimmedPtFrac5SmallR20Jets", - "AntiKt10UFOCSSKTrimmedPtFrac5SmallR20Jets", "AntiKt10UFOCSSKSoftDropBeta100Zcut10Jets", - "AntiKt10UFOCSSKBottomUpSoftDropBeta100Zcut5Jets", - "AntiKt10UFOCSSKRecursiveSoftDropBeta100Zcut5NinfJets", "BTagging_AntiKtVR30Rmax4Rmin02Track", "BTagging_AntiKt4EMPFlow", "BTagging_AntiKt4EMTopo", diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM8.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM8.py index 181d4a2fc84e857a2910633cd96aca0d0d7326a6..67395a8d548a3274ffd067498d97cf32306d5b15 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM8.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM8.py @@ -182,10 +182,8 @@ JETM8SlimmingHelper.SmartCollections = ["Electrons", "Photons", "Muons", "AntiKt10UFOCSSKJets", "AntiKt10UFOCSSKTrimmedPtFrac5SmallR20Jets", "AntiKt10UFOCSSKSoftDropBeta100Zcut10Jets", - "BTagging_AntiKt4EMPFlow_201810", - "BTagging_AntiKt4EMPFlow_201903", - "BTagging_AntiKtVR30Rmax4Rmin02Track_201810", - "BTagging_AntiKtVR30Rmax4Rmin02Track_201903", + "BTagging_AntiKt4EMPFlow", + "BTagging_AntiKtVR30Rmax4Rmin02Track", ] JETM8SlimmingHelper.AllVariables = ["CaloCalTopoClusters", "CSSKUFO", diff --git a/Reconstruction/Jet/JetRecConfig/python/StandardSmallRJets.py b/Reconstruction/Jet/JetRecConfig/python/StandardSmallRJets.py index 8a37a42be522a61ae1b5c54600142d508e428270..3bf47399f7c76b8f7c5e3fe210c5b2ca67275592 100644 --- a/Reconstruction/Jet/JetRecConfig/python/StandardSmallRJets.py +++ b/Reconstruction/Jet/JetRecConfig/python/StandardSmallRJets.py @@ -112,7 +112,7 @@ AntiKt4EMPFlowCSSK = JetDefinition("AntiKt",0.4,cst.GPFlowCSSK, AntiKt4EMPFlowNoPtCut = JetDefinition("AntiKt",0.4,cst.GPFlow, infix = "NoPtCut", ghostdefs = standardghosts+flavourghosts, - modifiers = calibmods_lowCut+("Filter:2000",)+truthmods+standardmods+("JetPtAssociation",), + modifiers = calibmods_lowCut+("Filter:1",)+truthmods+standardmods+("JetPtAssociation",), ptmin = 1, lock = True )