From 9a27607d8e864e89831406ede4cabd650dab8627 Mon Sep 17 00:00:00 2001
From: Thomas Strebler <thomas.strebler@cern.ch>
Date: Sun, 18 Dec 2022 19:09:06 +0100
Subject: [PATCH] FTag training run 4 in derivation
FTag training run 4 in derivation
---
.../share/referenceDuplicates.txt | 2 +-
.../python/AthenaMonitoringAODRecoCfg.py | 2 +-
.../DerivationFrameworkBPhys/python/BPHY1.py | 2 +-
.../DerivationFrameworkBPhys/python/BPHY10.py | 2 +-
.../DerivationFrameworkBPhys/python/BPHY12.py | 2 +-
.../DerivationFrameworkBPhys/python/BPHY13.py | 2 +-
.../DerivationFrameworkBPhys/python/BPHY15.py | 2 +-
.../DerivationFrameworkBPhys/python/BPHY16.py | 2 +-
.../DerivationFrameworkBPhys/python/BPHY18.py | 2 +-
.../DerivationFrameworkBPhys/python/BPHY2.py | 2 +-
.../DerivationFrameworkBPhys/python/BPHY21.py | 4 +-
.../DerivationFrameworkBPhys/python/BPHY22.py | 2 +-
.../DerivationFrameworkBPhys/python/BPHY3.py | 2 +-
.../DerivationFrameworkBPhys/python/BPHY4.py | 2 +-
.../DerivationFrameworkBPhys/python/BPHY5.py | 2 +-
.../DerivationFrameworkBPhys/python/BPHY6.py | 2 +-
.../python/SlimmingHelper.py | 35 +++---
.../DerivationFrameworkEGamma/python/EGAM1.py | 3 +-
.../python/EGAM10.py | 3 +-
.../DerivationFrameworkEGamma/python/EGAM2.py | 3 +-
.../DerivationFrameworkEGamma/python/EGAM3.py | 3 +-
.../DerivationFrameworkEGamma/python/EGAM4.py | 3 +-
.../DerivationFrameworkEGamma/python/EGAM5.py | 3 +-
.../DerivationFrameworkEGamma/python/EGAM7.py | 3 +-
.../DerivationFrameworkEGamma/python/EGAM8.py | 3 +-
.../DerivationFrameworkEGamma/python/EGAM9.py | 3 +-
.../DerivationFrameworkEGamma/share/EGAM6.py | 2 +-
.../DerivationFrameworkEGamma/share/EGAM7.py | 2 +-
.../python/TEST1.py | 2 +-
.../python/TEST2.py | 2 +-
.../python/TEST3.py | 2 +-
.../python/TEST4.py | 2 +-
.../python/TEST5.py | 2 +-
.../python/TEST6.py | 2 +-
.../python/BTaggingContent.py | 108 +++++++++---------
.../python/FTAG1.py | 2 +-
.../python/FTAG2.py | 2 +-
...ationConfig.py => FtagDerivationConfig.py} | 4 +-
.../python/HIGG1D1.py | 12 +-
.../DerivationFrameworkHiggs/share/HIGG1D1.py | 2 +-
.../DerivationFrameworkInDet/python/IDTIDE.py | 2 +-
.../DerivationFrameworkInDet/python/IDTR2.py | 2 +-
.../python/JETM1.py | 2 +-
.../python/JETM10.py | 2 +-
.../python/JETM11.py | 4 +-
.../python/JETM12.py | 2 +-
.../python/JETM14.py | 2 +-
.../python/JETM2.py | 2 +-
.../python/JETM3.py | 2 +-
.../python/JETM4.py | 2 +-
.../python/JETM5.py | 2 +-
.../python/JETM6.py | 2 +-
.../DerivationFrameworkLLP/python/LLP1.py | 4 +-
.../DerivationFrameworkLLP/share/LLP1.py | 2 +-
.../python/TRUTH1.py | 2 +-
.../python/TRUTH3.py | 2 +-
.../DerivationFrameworkPhys/python/PHYS.py | 2 +-
.../python/PHYSLITE.py | 2 +-
.../python/PhysCommon.py | 2 +-
.../python/PhysCommonConfig.py | 2 +-
.../python/PHYSVAL.py | 2 +-
.../share/PHYSVAL.py | 2 +-
.../DerivationFrameworkSM/python/STDM7.py | 2 +-
.../python/TCAL1.py | 2 +-
.../python/TCAL2.py | 2 +-
.../DerivationFrameworkTrigger/share/TRIG.py | 4 +-
.../JetTagging/JetTagAlgs/BTagging/README.md | 2 +-
.../{BTagRun3Config.py => BTagConfig.py} | 19 ++-
.../JetTagAlgs/BTagging/python/BTagESD.py | 2 +-
.../RecExCommon/share/CombinedRec_config.py | 2 +-
.../RecJobTransforms/python/RecoSteering.py | 2 +-
.../Bjet/BjetFlavourTaggingConfiguration.py | 2 +-
72 files changed, 179 insertions(+), 150 deletions(-)
rename PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/python/{FtagRun3DerivationConfig.py => FtagDerivationConfig.py} (98%)
rename PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/{BTagRun3Config.py => BTagConfig.py} (95%)
diff --git a/Control/AthenaConfiguration/share/referenceDuplicates.txt b/Control/AthenaConfiguration/share/referenceDuplicates.txt
index 5d41025f67bf..53282505ebe8 100644
--- a/Control/AthenaConfiguration/share/referenceDuplicates.txt
+++ b/Control/AthenaConfiguration/share/referenceDuplicates.txt
@@ -1 +1 @@
-{"getComps": ["Database/AthenaPOOL/AthenaPoolCnvSvc/python/PoolReadConfig.py", "Reconstruction/egamma/egammaMVACalib/python/egammaMVACalibConfig.py", "MuonSpectrometer/MuonG4/MuonG4SD/python/MuonG4SDToolConfig.py", "Simulation/G4Atlas/G4AtlasServices/python/G4AtlasServicesConfig.py", "Simulation/G4Atlas/G4AtlasTools/python/G4FieldConfig.py", "LArCalorimeter/LArCellRec/python/LArNoisyROSummaryConfig.py", "InnerDetector/InDetDigitization/StripDigitization/python/StripDigitizationConfig.py", "MuonSpectrometer/MuonConfig/python/MuonRecToolsConfig.py", "Calorimeter/CaloRec/python/CaloTopoClusterConfig.py", "Simulation/G4Atlas/G4AtlasTools/python/G4GeometryToolConfig.py", "TileCalorimeter/TileRecUtils/python/TileCellMakerConfig.py", "LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_BadChannelConfig.py", "InnerDetector/InDetDigitization/SCT_Digitization/python/SCT_DigitizationConfig.py", "PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagRun3Config.py", "Reconstruction/egamma/egammaMVACalib/python/TrigEgammaMVACalibConfig.py", "PhysicsAnalysis/JetTagging/JetTagCalibration/python/JetTagCalibConfig.py", "Simulation/Digitization/python/PileUpToolsConfig.py", "MuonSpectrometer/MuonConfig/python/MuonTrackBuildingConfig.py", "Database/AthenaPOOL/OutputStreamAthenaPool/python/OutputStreamConfig.py", "MuonSpectrometer/MuonConfig/python/MuonCondSvcConfig.py", "TileCalorimeter/TileG4/TileGeoG4SD/python/TileGeoG4SDToolConfig.py", "Control/AthenaServices/python/MetaDataSvcConfig.py", "Reconstruction/RecoTools/TrackToCalo/python/TrackToCaloConfig.py", "PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/python/FtagRun3DerivationConfig.py", "Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py", "MuonSpectrometer/MuonConfig/python/MuonCondAlgConfig.py", "Trigger/TrigAlgorithms/TrigT2CaloEgamma/python/TrigT2CaloEgammaMTConfig.py", "Control/SGComps/python/AddressRemappingConfig.py", "MuonSpectrometer/MuonConfig/python/MuonSegmentFindingConfig.py", "MuonSpectrometer/MuonConfig/python/MuonGeometryConfig.py", "LArCalorimeter/LArCabling/python/LArCablingConfig.py", "LArCalorimeter/LArCellRec/python/LArCellBuilderConfig.py", "Reconstruction/egamma/egammaTools/python/EMShowerBuilderConfig.py"], "THistSvc": ["Control/AthenaExamples/AthExMonitored/python/MonitoredConfig.py", "Simulation/Tools/RDOAnalysis/python/RDOAnalysisConfig.py", "LArCalorimeter/LArCafJobs/python/LArShapeDumperConfig.py", "TileCalorimeter/TileRec/python/TileAANtupleConfig.py", "Tracking/TrkExtrapolation/TrkExAlgs/python/TrkExAlgsConfig.py", "Reconstruction/eflowRec/python/PFHLTConfig.py", "Simulation/G4Atlas/G4AtlasTests/share/DCubeTestsConfig.py", "Trigger/TriggerCommon/TriggerJobOpts/python/TriggerHistSvcConfig.py"], "DQDummyFilterTool": ["Control/AthenaMonitoring/python/BadLBFilterToolConfig.py", "Control/AthenaMonitoring/python/AtlasReadyFilterConfig.py"], "StoreGateSvc": ["Simulation/ISF/ISF_Geant4/ISF_Geant4CommonTools/python/ISF_Geant4CommonToolsConfigNew.py", "Control/AthenaServices/python/MetaDataSvcConfig.py"], "ProxyProviderSvc": ["Control/AthenaServices/python/MetaDataSvcConfig.py", "HLT/Event/TrigByteStreamCnvSvc/python/TrigByteStreamConfig.py", "Trigger/TrigAlgorithms/TrigT2CaloCommon/python/TrigCaloDataAccessConfig.py"], "getComp": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "Trigger/TrigT1/TrigT1MuonRecRoiTool/python/TrigT1MuonRecRoiToolConfig.py", "TileCalorimeter/TileConditions/python/TileTimingConfig.py", "TileCalorimeter/TileConditions/python/TilePulseShapeConfig.py", "TileCalorimeter/TileConditions/python/TileIntegratorConfig.py", "TileCalorimeter/TileConditions/python/TileOFCConfig.py", "Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/python/TrackCaloClusterConfig.py", "TileCalorimeter/TileConditions/python/TileBadChannelsConfig.py", "Trigger/TrigAlgorithms/TrigT2CaloCommon/python/TrigCaloDataAccessConfig.py", "TileCalorimeter/TileConditions/python/TileEMScaleConfig.py", "TileCalorimeter/TileConditions/python/TileAutoCorrelationConfig.py", "Trigger/TrigT1/TrigT1CaloByteStream/python/LVL1CaloRun2ByteStreamConfig.py", "LArCalorimeter/LArConfiguration/python/LArElecCalibDBConfig.py", "Reconstruction/MET/METUtilities/python/ORMETMakerConfig.py", "TileCalorimeter/TileConditions/python/TileMuIDConfig.py", "Trigger/TrigSteer/L1Decoder/python/L1DecoderConfig.py", "Reconstruction/Jet/JetRecTools/python/JetRecToolsConfig.py", "TileCalorimeter/TileConditions/python/TileDSPThresholdConfig.py", "TileCalorimeter/TileConditions/python/TileSampleNoiseConfig.py", "TileCalorimeter/TileConditions/python/TileTMDBConfig.py", "Database/AthenaPOOL/OutputStreamAthenaPool/python/OutputStreamConfig.py", "Reconstruction/MET/METUtilities/python/METMakerConfig.py", "Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py", "Calorimeter/CaloRec/python/CaloBCIDCoeffsCondAlgConfig.py", "Trigger/TrigT1/TrigT1MuctpiPhase1/python/TrigT1MuctpiPhase1Config.py", "Reconstruction/Jet/JetRecConfig/python/JetRecConfig.py", "MuonSpectrometer/MuonConfig/python/MuonSegmentFindingConfig.py", "Trigger/TrigSteer/DecisionHandling/python/HLTSignatureConfig.py"], "EvtPersistencySvc": ["HLT/Event/TrigByteStreamCnvSvc/python/TrigByteStreamConfig.py", "Database/AthenaPOOL/AthenaPoolCnvSvc/python/PoolWriteConfig.py"], "TriggerSummaryAlg": ["HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/python/MTCalibPebConfig.py", "Trigger/TrigSteer/DecisionHandling/python/DecisionHandlingConfig.py"], "TriggerBitsMakerTool": ["Trigger/TrigSteer/TrigOutputHandling/python/TrigOutputHandlingConfig.py", "Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py"], "CaloClusterMomentsMaker": ["TileCalorimeter/TileMonitoring/python/TileTopoClusterConfig.py", "Trigger/TrigAlgorithms/TrigCaloRec/python/TrigCaloRecConfig.py"], "InDet.InDetPriVxFinder": ["InnerDetector/InDetConfig/python/VertexFindingConfig.py", "Trigger/TrigTools/TrigInDetConfig/python/TrigInDetPriVtxConfig.py"], "Trk.VertexCollectionSortingTool": ["InnerDetector/InDetConfig/python/VertexFindingConfig.py", "Trigger/TrigTools/TrigInDetConfig/python/TrigInDetPriVtxConfig.py"], "Trk.SumPtVertexWeightCalculator": ["InnerDetector/InDetConfig/python/VertexFindingConfig.py", "Trigger/TrigTools/TrigInDetConfig/python/TrigInDetPriVtxConfig.py"], "InDet.InDetTrackSelectionTool": ["InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/python/InDetGlobalMonitoringRun3TestConfig.py", "InnerDetector/InDetConfig/python/VertexFindingConfig.py", "InnerDetector/InDetMonitoring/InDetAlignmentMonitoringRun3/python/InDetAlignmentMonitoringRun3Config.py", "Reconstruction/eflowRec/python/PFHLTConfig.py", "Trigger/TrigTools/TrigInDetConfig/python/TrigInDetPriVtxConfig.py"], "Trk.RungeKuttaPropagator": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/InDetRecToolConfig.py", "Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py", "MuonSpectrometer/MuonConfig/python/MuonRecToolsConfig.py", "InnerDetector/InDetConfig/python/TrackingCommonConfig.py"], "InDet.SiDetElementsRoadCondAlg_xk": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/TrackingSiPatternConfig.py", "InnerDetector/InDetConfig/python/BackTrackingConfig.py", "InnerDetector/InDetConfig/python/TRTExtensionConfig.py"], "InDet.SiDetElementsRoadMaker_xk": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/TrackingSiPatternConfig.py", "InnerDetector/InDetConfig/python/BackTrackingConfig.py", "InnerDetector/InDetConfig/python/TRTExtensionConfig.py"], "InDet.NnClusterizationFactory": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/TrackingCommonConfig.py"], "InDet.PixelClusterOnTrackTool": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/TrackingCommonConfig.py"], "InDet.SCT_ClusterOnTrackTool": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/TrackingCommonConfig.py"], "Trk.RIO_OnTrackCreator": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/TrackingCommonConfig.py"], "Trk.KalmanUpdator_xk": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/TrackingCommonConfig.py"], "InDet.SiCombinatorialTrackFinder_xk": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/TrackingSiPatternConfig.py", "InnerDetector/InDetConfig/python/TrackingCommonConfig.py", "InnerDetector/InDetConfig/python/TRTExtensionConfig.py"], "RIO_OnTrackErrorScalingCondAlg": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/TrackingCommonConfig.py"], "InDet.SiTrackMaker_xk": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/TrackingSiPatternConfig.py", "InnerDetector/InDetConfig/python/TRTExtensionConfig.py"], "InDet.InDetTestPixelLayerTool": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/InDetRecToolConfig.py"], "InDet.InDetTrackHoleSearchTool": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/InDetRecToolConfig.py"], "InDet.InDetPRD_AssociationToolGangedPixels": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "Tracking/TrkConfig/python/AtlasTrackSummaryToolConfig.py", "InnerDetector/InDetConfig/python/InDetRecToolConfig.py"], "InDet.InDetTrackSummaryHelperTool": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/InDetRecToolConfig.py"], "Trk.TrackSummaryTool": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "Tracking/TrkConfig/python/AtlasTrackSummaryToolConfig.py", "InnerDetector/InDetConfig/python/TrackingCommonConfig.py"], "InDet.SiDetElementBoundaryLinksCondAlg_xk": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/TrackingSiPatternConfig.py", "InnerDetector/InDetConfig/python/BackTrackingConfig.py", "InnerDetector/InDetConfig/python/TRTExtensionConfig.py"], "Reco.TrackToVertex": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/TrackRecoConfig.py", "PhysicsAnalysis/JetTagging/JetTagTools/python/BTagTrackToVertexToolConfig.py", "Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py"], "Trk.TrackParticleCreatorTool": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/TrackRecoConfig.py", "Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py"], "InDet.InDetTrtDriftCircleCutTool": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/TrackingCommonConfig.py"], "InDet.TRT_DetElementsRoadCondAlg_xk": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/TrackingCommonConfig.py"], "InDet.TRT_DetElementsRoadMaker_xk": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/TrackingCommonConfig.py"], "InDet.TRT_TrackExtensionTool_xk": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/TrackingCommonConfig.py"], "InDet.TRT_TrackExtensionAlg": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/TRTExtensionConfig.py"], "InDet.InDetExtensionProcessor": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/TRTExtensionConfig.py"], "InDet.InDetPRDtoTrackMapToolGangedPixels": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/TrackingCommonConfig.py"], "InDet.InDetAmbiTrackSelectionTool": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/BackTrackingConfig.py"], "InDet.InDetAmbiScoringTool": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/TrackingCommonConfig.py"], "Trk.KalmanUpdator": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py", "InnerDetector/InDetConfig/python/TrackingCommonConfig.py"], "Trk.GlobalChi2Fitter": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py", "InnerDetector/InDetConfig/python/TrackingCommonConfig.py"], "Trk.MaterialEffectsUpdator": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/InDetRecToolConfig.py"], "Trk.SimpleAmbiguityProcessorTool": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/BackTrackingConfig.py"], "Trk.TrkAmbiguityScore": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/TrackingSiPatternConfig.py", "InnerDetector/InDetConfig/python/BackTrackingConfig.py"], "Trk.TrkAmbiguitySolver": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/TrackingSiPatternConfig.py", "InnerDetector/InDetConfig/python/BackTrackingConfig.py"], "PseudoJetMerger": ["Reconstruction/Jet/JetRecConfig/python/JetRecConfig.py", "Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Jet/JetRecoConfig.py"], "PseudoJetAlgorithm": ["Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Jet/JetTrackingConfig.py", "Reconstruction/Jet/JetRecConfig/python/JetRecConfig.py"], "JetAlgorithm": ["Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Jet/JetTrackingConfig.py", "Reconstruction/Jet/JetRecConfig/python/JetRecConfig.py", "Reconstruction/Jet/JetRecConfig/python/JetInputConfig.py"], "TrackVertexAssociationTool": ["Reconstruction/Jet/JetRecTools/python/JetRecToolsConfig.py", "Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Jet/JetTrackingConfig.py"], "Trk__TrkVKalVrtFitter": ["Trigger/TrigHypothesis/TrigBphysHypo/python/TrigBmumuxComboHypoConfig.py", "Trigger/TrigHypothesis/TrigBphysHypo/python/TrigMultiTrkComboHypoConfig.py"], "InDet__VertexPointEstimator": ["Trigger/TrigHypothesis/TrigBphysHypo/python/TrigBmumuxComboHypoConfig.py", "Trigger/TrigHypothesis/TrigBphysHypo/python/TrigMultiTrkComboHypoConfig.py"], "AthenaPoolCnvSvc": ["Simulation/G4Atlas/G4AtlasAlg/python/G4AtlasAlgConfig.py", "MuonSpectrometer/MuonConfig/python/MuonRdoDecodeConfig.py"], "CaloCellContainerFinalizerTool": ["Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/python/ISF_FastCaloSimServicesConfigNew.py", "Calorimeter/CaloRec/python/CaloCellMakerConfig.py"], "CaloTopoClusterMaker": ["TileCalorimeter/TileMonitoring/python/TileTopoClusterConfig.py", "Calorimeter/CaloRec/python/CaloTopoClusterConfig.py"], "CaloTopoClusterSplitter": ["TileCalorimeter/TileMonitoring/python/TileTopoClusterConfig.py", "Calorimeter/CaloRec/python/CaloTopoClusterConfig.py"], "LArADC2MeVCondAlg": ["LArCalorimeter/LArRecUtils/python/LArADC2MeVSCCondAlgConfig.py", "LArCalorimeter/LArRecUtils/python/LArADC2MeVCondAlgConfig.py"], "Trk.TrackingVolumeArrayCreator": ["Tracking/TrkConfig/python/AtlasTrackingGeometrySvcConfig.py", "Tracking/TrkConditions/TrackingGeometryCondAlg/python/AtlasTrackingGeometryCondAlgConfig.py"], "Trk.TrackingVolumeHelper": ["Tracking/TrkConfig/python/AtlasTrackingGeometrySvcConfig.py", "Tracking/TrkConditions/TrackingGeometryCondAlg/python/AtlasTrackingGeometryCondAlgConfig.py"], "ISF.LegacySimSvc": ["Simulation/ISF/ISF_Core/ISF_Services/python/ISF_ServicesCoreConfigNew.py", "Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/python/ISF_FastCaloSimServicesConfigNew.py", "Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/ISF_FatrasConfig.py"], "MergeRecoTimingObjTool": ["Simulation/G4Utilities/MCTruthSimAlgs/python/MCTruthSimAlgsConfigNew.py", "Simulation/G4Utilities/MCTruthSimAlgs/python/RecoTimingConfig.py"], "FlavorTagDiscriminants.BTagDecoratorAlg": ["PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/HighLevelBTagAlgConfig.py", "PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagHighLevelAugmenterAlgConfig.py"], "AsgElectronLikelihoodTool": ["Reconstruction/MET/METUtilities/python/METMakerConfig.py", "Reconstruction/MET/METUtilities/python/ORMETMakerConfig.py"], "AsgPhotonIsEMSelector": ["Reconstruction/MET/METUtilities/python/METMakerConfig.py", "Reconstruction/MET/METUtilities/python/ORMETMakerConfig.py"], "TrackDepositInCaloTool": ["Reconstruction/eflowRec/python/PFHLTConfig.py", "Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py"], "CaloMuonScoreTool": ["Reconstruction/eflowRec/python/PFHLTConfig.py", "Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py"], "CaloMuonTag": ["Reconstruction/eflowRec/python/PFHLTConfig.py", "Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py"], "Trk.ParticleCaloExtensionTool": ["Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedReconstructionConfig.py", "Reconstruction/eflowRec/python/PFHLTConfig.py"], "Muon.MuonEDMHelperSvc": ["Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedReconstructionConfig.py", "Event/DumpEventDataToJSON/python/DumpEventDataToJSONConfig.py"], "InDet.SiZvertexMaker_xk": ["InnerDetector/InDetConfig/python/TrackingSiPatternConfig.py", "InnerDetector/InDetConfig/python/TRTExtensionConfig.py"], "SCT_ConditionsSummaryTool": ["InnerDetector/InDetConfig/python/InDetRecToolConfig.py", "InnerDetector/InDetConfig/python/TrackingSiPatternConfig.py"], "InDet.SeedToTrackConversionTool": ["InnerDetector/InDetConfig/python/TrackingSiPatternConfig.py", "InnerDetector/InDetConfig/python/TRTExtensionConfig.py"], "InDet.SiSPSeededTrackFinder": ["InnerDetector/InDetConfig/python/TrackingSiPatternConfig.py", "InnerDetector/InDetConfig/python/TRTExtensionConfig.py"], "SCT_CablingTool": ["InnerDetector/InDetConfig/python/InDetRecToolConfig.py", "InnerDetector/InDetDetDescr/SCT_Cabling/python/TestSCT_CablingConfig.py"], "PixelAlignCondAlg": ["InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/ITkPixelConditionsConfig.py", "InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py"], "PixelChargeCalibCondAlg": ["InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/ITkPixelConditionsConfig.py", "InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py"], "PixelChargeLUTCalibCondAlg": ["InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/ITkPixelConditionsConfig.py", "InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py"], "PixelDCSCondHVAlg": ["InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/ITkPixelConditionsConfig.py", "InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py"], "PixelDCSCondStateAlg": ["InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/ITkPixelConditionsConfig.py", "InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py"], "PixelDCSCondStatusAlg": ["InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/ITkPixelConditionsConfig.py", "InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py"], "PixelDCSCondTempAlg": ["InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/ITkPixelConditionsConfig.py", "InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py"], "PixelDeadMapCondAlg": ["InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/ITkPixelConditionsConfig.py", "InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py"], "PixelDetectorElementCondAlg": ["InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/ITkPixelConditionsConfig.py", "InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py"], "PixelDistortionAlg": ["InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/ITkPixelConditionsConfig.py", "InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py"], "PixelConditionsSummaryTool": ["InnerDetector/InDetConditions/PixelConditionsTools/python/PixelConditionsSummaryConfig.py", "InnerDetector/InDetConditions/PixelConditionsTools/python/ITkPixelConditionsSummaryConfig.py"], "DetDescrDBEnvelopeSvc": ["AtlasGeometryCommon/SubDetectorEnvelopes/python/SubDetectorEnvelopesConfig.py", "Simulation/ISF/ISF_Geant4/ISF_Geant4Services/python/ISF_Geant4ServicesConfigNew.py"]}
+{"getComps": ["Database/AthenaPOOL/AthenaPoolCnvSvc/python/PoolReadConfig.py", "Reconstruction/egamma/egammaMVACalib/python/egammaMVACalibConfig.py", "MuonSpectrometer/MuonG4/MuonG4SD/python/MuonG4SDToolConfig.py", "Simulation/G4Atlas/G4AtlasServices/python/G4AtlasServicesConfig.py", "Simulation/G4Atlas/G4AtlasTools/python/G4FieldConfig.py", "LArCalorimeter/LArCellRec/python/LArNoisyROSummaryConfig.py", "InnerDetector/InDetDigitization/StripDigitization/python/StripDigitizationConfig.py", "MuonSpectrometer/MuonConfig/python/MuonRecToolsConfig.py", "Calorimeter/CaloRec/python/CaloTopoClusterConfig.py", "Simulation/G4Atlas/G4AtlasTools/python/G4GeometryToolConfig.py", "TileCalorimeter/TileRecUtils/python/TileCellMakerConfig.py", "LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_BadChannelConfig.py", "InnerDetector/InDetDigitization/SCT_Digitization/python/SCT_DigitizationConfig.py", "PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagConfig.py", "Reconstruction/egamma/egammaMVACalib/python/TrigEgammaMVACalibConfig.py", "PhysicsAnalysis/JetTagging/JetTagCalibration/python/JetTagCalibConfig.py", "Simulation/Digitization/python/PileUpToolsConfig.py", "MuonSpectrometer/MuonConfig/python/MuonTrackBuildingConfig.py", "Database/AthenaPOOL/OutputStreamAthenaPool/python/OutputStreamConfig.py", "MuonSpectrometer/MuonConfig/python/MuonCondSvcConfig.py", "TileCalorimeter/TileG4/TileGeoG4SD/python/TileGeoG4SDToolConfig.py", "Control/AthenaServices/python/MetaDataSvcConfig.py", "Reconstruction/RecoTools/TrackToCalo/python/TrackToCaloConfig.py", "PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/python/FtagDerivationConfig.py", "Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py", "MuonSpectrometer/MuonConfig/python/MuonCondAlgConfig.py", "Trigger/TrigAlgorithms/TrigT2CaloEgamma/python/TrigT2CaloEgammaMTConfig.py", "Control/SGComps/python/AddressRemappingConfig.py", "MuonSpectrometer/MuonConfig/python/MuonSegmentFindingConfig.py", "MuonSpectrometer/MuonConfig/python/MuonGeometryConfig.py", "LArCalorimeter/LArCabling/python/LArCablingConfig.py", "LArCalorimeter/LArCellRec/python/LArCellBuilderConfig.py", "Reconstruction/egamma/egammaTools/python/EMShowerBuilderConfig.py"], "THistSvc": ["Control/AthenaExamples/AthExMonitored/python/MonitoredConfig.py", "Simulation/Tools/RDOAnalysis/python/RDOAnalysisConfig.py", "LArCalorimeter/LArCafJobs/python/LArShapeDumperConfig.py", "TileCalorimeter/TileRec/python/TileAANtupleConfig.py", "Tracking/TrkExtrapolation/TrkExAlgs/python/TrkExAlgsConfig.py", "Reconstruction/eflowRec/python/PFHLTConfig.py", "Simulation/G4Atlas/G4AtlasTests/share/DCubeTestsConfig.py", "Trigger/TriggerCommon/TriggerJobOpts/python/TriggerHistSvcConfig.py"], "DQDummyFilterTool": ["Control/AthenaMonitoring/python/BadLBFilterToolConfig.py", "Control/AthenaMonitoring/python/AtlasReadyFilterConfig.py"], "StoreGateSvc": ["Simulation/ISF/ISF_Geant4/ISF_Geant4CommonTools/python/ISF_Geant4CommonToolsConfigNew.py", "Control/AthenaServices/python/MetaDataSvcConfig.py"], "ProxyProviderSvc": ["Control/AthenaServices/python/MetaDataSvcConfig.py", "HLT/Event/TrigByteStreamCnvSvc/python/TrigByteStreamConfig.py", "Trigger/TrigAlgorithms/TrigT2CaloCommon/python/TrigCaloDataAccessConfig.py"], "getComp": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "Trigger/TrigT1/TrigT1MuonRecRoiTool/python/TrigT1MuonRecRoiToolConfig.py", "TileCalorimeter/TileConditions/python/TileTimingConfig.py", "TileCalorimeter/TileConditions/python/TilePulseShapeConfig.py", "TileCalorimeter/TileConditions/python/TileIntegratorConfig.py", "TileCalorimeter/TileConditions/python/TileOFCConfig.py", "Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/python/TrackCaloClusterConfig.py", "TileCalorimeter/TileConditions/python/TileBadChannelsConfig.py", "Trigger/TrigAlgorithms/TrigT2CaloCommon/python/TrigCaloDataAccessConfig.py", "TileCalorimeter/TileConditions/python/TileEMScaleConfig.py", "TileCalorimeter/TileConditions/python/TileAutoCorrelationConfig.py", "Trigger/TrigT1/TrigT1CaloByteStream/python/LVL1CaloRun2ByteStreamConfig.py", "LArCalorimeter/LArConfiguration/python/LArElecCalibDBConfig.py", "Reconstruction/MET/METUtilities/python/ORMETMakerConfig.py", "TileCalorimeter/TileConditions/python/TileMuIDConfig.py", "Trigger/TrigSteer/L1Decoder/python/L1DecoderConfig.py", "Reconstruction/Jet/JetRecTools/python/JetRecToolsConfig.py", "TileCalorimeter/TileConditions/python/TileDSPThresholdConfig.py", "TileCalorimeter/TileConditions/python/TileSampleNoiseConfig.py", "TileCalorimeter/TileConditions/python/TileTMDBConfig.py", "Database/AthenaPOOL/OutputStreamAthenaPool/python/OutputStreamConfig.py", "Reconstruction/MET/METUtilities/python/METMakerConfig.py", "Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py", "Calorimeter/CaloRec/python/CaloBCIDCoeffsCondAlgConfig.py", "Trigger/TrigT1/TrigT1MuctpiPhase1/python/TrigT1MuctpiPhase1Config.py", "Reconstruction/Jet/JetRecConfig/python/JetRecConfig.py", "MuonSpectrometer/MuonConfig/python/MuonSegmentFindingConfig.py", "Trigger/TrigSteer/DecisionHandling/python/HLTSignatureConfig.py"], "EvtPersistencySvc": ["HLT/Event/TrigByteStreamCnvSvc/python/TrigByteStreamConfig.py", "Database/AthenaPOOL/AthenaPoolCnvSvc/python/PoolWriteConfig.py"], "TriggerSummaryAlg": ["HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/python/MTCalibPebConfig.py", "Trigger/TrigSteer/DecisionHandling/python/DecisionHandlingConfig.py"], "TriggerBitsMakerTool": ["Trigger/TrigSteer/TrigOutputHandling/python/TrigOutputHandlingConfig.py", "Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py"], "CaloClusterMomentsMaker": ["TileCalorimeter/TileMonitoring/python/TileTopoClusterConfig.py", "Trigger/TrigAlgorithms/TrigCaloRec/python/TrigCaloRecConfig.py"], "InDet.InDetPriVxFinder": ["InnerDetector/InDetConfig/python/VertexFindingConfig.py", "Trigger/TrigTools/TrigInDetConfig/python/TrigInDetPriVtxConfig.py"], "Trk.VertexCollectionSortingTool": ["InnerDetector/InDetConfig/python/VertexFindingConfig.py", "Trigger/TrigTools/TrigInDetConfig/python/TrigInDetPriVtxConfig.py"], "Trk.SumPtVertexWeightCalculator": ["InnerDetector/InDetConfig/python/VertexFindingConfig.py", "Trigger/TrigTools/TrigInDetConfig/python/TrigInDetPriVtxConfig.py"], "InDet.InDetTrackSelectionTool": ["InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/python/InDetGlobalMonitoringRun3TestConfig.py", "InnerDetector/InDetConfig/python/VertexFindingConfig.py", "InnerDetector/InDetMonitoring/InDetAlignmentMonitoringRun3/python/InDetAlignmentMonitoringRun3Config.py", "Reconstruction/eflowRec/python/PFHLTConfig.py", "Trigger/TrigTools/TrigInDetConfig/python/TrigInDetPriVtxConfig.py"], "Trk.RungeKuttaPropagator": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/InDetRecToolConfig.py", "Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py", "MuonSpectrometer/MuonConfig/python/MuonRecToolsConfig.py", "InnerDetector/InDetConfig/python/TrackingCommonConfig.py"], "InDet.SiDetElementsRoadCondAlg_xk": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/TrackingSiPatternConfig.py", "InnerDetector/InDetConfig/python/BackTrackingConfig.py", "InnerDetector/InDetConfig/python/TRTExtensionConfig.py"], "InDet.SiDetElementsRoadMaker_xk": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/TrackingSiPatternConfig.py", "InnerDetector/InDetConfig/python/BackTrackingConfig.py", "InnerDetector/InDetConfig/python/TRTExtensionConfig.py"], "InDet.NnClusterizationFactory": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/TrackingCommonConfig.py"], "InDet.PixelClusterOnTrackTool": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/TrackingCommonConfig.py"], "InDet.SCT_ClusterOnTrackTool": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/TrackingCommonConfig.py"], "Trk.RIO_OnTrackCreator": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/TrackingCommonConfig.py"], "Trk.KalmanUpdator_xk": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/TrackingCommonConfig.py"], "InDet.SiCombinatorialTrackFinder_xk": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/TrackingSiPatternConfig.py", "InnerDetector/InDetConfig/python/TrackingCommonConfig.py", "InnerDetector/InDetConfig/python/TRTExtensionConfig.py"], "RIO_OnTrackErrorScalingCondAlg": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/TrackingCommonConfig.py"], "InDet.SiTrackMaker_xk": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/TrackingSiPatternConfig.py", "InnerDetector/InDetConfig/python/TRTExtensionConfig.py"], "InDet.InDetTestPixelLayerTool": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/InDetRecToolConfig.py"], "InDet.InDetTrackHoleSearchTool": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/InDetRecToolConfig.py"], "InDet.InDetPRD_AssociationToolGangedPixels": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "Tracking/TrkConfig/python/AtlasTrackSummaryToolConfig.py", "InnerDetector/InDetConfig/python/InDetRecToolConfig.py"], "InDet.InDetTrackSummaryHelperTool": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/InDetRecToolConfig.py"], "Trk.TrackSummaryTool": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "Tracking/TrkConfig/python/AtlasTrackSummaryToolConfig.py", "InnerDetector/InDetConfig/python/TrackingCommonConfig.py"], "InDet.SiDetElementBoundaryLinksCondAlg_xk": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/TrackingSiPatternConfig.py", "InnerDetector/InDetConfig/python/BackTrackingConfig.py", "InnerDetector/InDetConfig/python/TRTExtensionConfig.py"], "Reco.TrackToVertex": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/TrackRecoConfig.py", "PhysicsAnalysis/JetTagging/JetTagTools/python/BTagTrackToVertexToolConfig.py", "Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py"], "Trk.TrackParticleCreatorTool": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/TrackRecoConfig.py", "Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py"], "InDet.InDetTrtDriftCircleCutTool": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/TrackingCommonConfig.py"], "InDet.TRT_DetElementsRoadCondAlg_xk": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/TrackingCommonConfig.py"], "InDet.TRT_DetElementsRoadMaker_xk": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/TrackingCommonConfig.py"], "InDet.TRT_TrackExtensionTool_xk": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/TrackingCommonConfig.py"], "InDet.TRT_TrackExtensionAlg": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/TRTExtensionConfig.py"], "InDet.InDetExtensionProcessor": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/TRTExtensionConfig.py"], "InDet.InDetPRDtoTrackMapToolGangedPixels": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/TrackingCommonConfig.py"], "InDet.InDetAmbiTrackSelectionTool": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/BackTrackingConfig.py"], "InDet.InDetAmbiScoringTool": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/TrackingCommonConfig.py"], "Trk.KalmanUpdator": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py", "InnerDetector/InDetConfig/python/TrackingCommonConfig.py"], "Trk.GlobalChi2Fitter": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py", "InnerDetector/InDetConfig/python/TrackingCommonConfig.py"], "Trk.MaterialEffectsUpdator": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/InDetRecToolConfig.py"], "Trk.SimpleAmbiguityProcessorTool": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/BackTrackingConfig.py"], "Trk.TrkAmbiguityScore": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/TrackingSiPatternConfig.py", "InnerDetector/InDetConfig/python/BackTrackingConfig.py"], "Trk.TrkAmbiguitySolver": ["Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py", "InnerDetector/InDetConfig/python/TrackingSiPatternConfig.py", "InnerDetector/InDetConfig/python/BackTrackingConfig.py"], "PseudoJetMerger": ["Reconstruction/Jet/JetRecConfig/python/JetRecConfig.py", "Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Jet/JetRecoConfig.py"], "PseudoJetAlgorithm": ["Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Jet/JetTrackingConfig.py", "Reconstruction/Jet/JetRecConfig/python/JetRecConfig.py"], "JetAlgorithm": ["Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Jet/JetTrackingConfig.py", "Reconstruction/Jet/JetRecConfig/python/JetRecConfig.py", "Reconstruction/Jet/JetRecConfig/python/JetInputConfig.py"], "TrackVertexAssociationTool": ["Reconstruction/Jet/JetRecTools/python/JetRecToolsConfig.py", "Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Jet/JetTrackingConfig.py"], "Trk__TrkVKalVrtFitter": ["Trigger/TrigHypothesis/TrigBphysHypo/python/TrigBmumuxComboHypoConfig.py", "Trigger/TrigHypothesis/TrigBphysHypo/python/TrigMultiTrkComboHypoConfig.py"], "InDet__VertexPointEstimator": ["Trigger/TrigHypothesis/TrigBphysHypo/python/TrigBmumuxComboHypoConfig.py", "Trigger/TrigHypothesis/TrigBphysHypo/python/TrigMultiTrkComboHypoConfig.py"], "AthenaPoolCnvSvc": ["Simulation/G4Atlas/G4AtlasAlg/python/G4AtlasAlgConfig.py", "MuonSpectrometer/MuonConfig/python/MuonRdoDecodeConfig.py"], "CaloCellContainerFinalizerTool": ["Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/python/ISF_FastCaloSimServicesConfigNew.py", "Calorimeter/CaloRec/python/CaloCellMakerConfig.py"], "CaloTopoClusterMaker": ["TileCalorimeter/TileMonitoring/python/TileTopoClusterConfig.py", "Calorimeter/CaloRec/python/CaloTopoClusterConfig.py"], "CaloTopoClusterSplitter": ["TileCalorimeter/TileMonitoring/python/TileTopoClusterConfig.py", "Calorimeter/CaloRec/python/CaloTopoClusterConfig.py"], "LArADC2MeVCondAlg": ["LArCalorimeter/LArRecUtils/python/LArADC2MeVSCCondAlgConfig.py", "LArCalorimeter/LArRecUtils/python/LArADC2MeVCondAlgConfig.py"], "Trk.TrackingVolumeArrayCreator": ["Tracking/TrkConfig/python/AtlasTrackingGeometrySvcConfig.py", "Tracking/TrkConditions/TrackingGeometryCondAlg/python/AtlasTrackingGeometryCondAlgConfig.py"], "Trk.TrackingVolumeHelper": ["Tracking/TrkConfig/python/AtlasTrackingGeometrySvcConfig.py", "Tracking/TrkConditions/TrackingGeometryCondAlg/python/AtlasTrackingGeometryCondAlgConfig.py"], "ISF.LegacySimSvc": ["Simulation/ISF/ISF_Core/ISF_Services/python/ISF_ServicesCoreConfigNew.py", "Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/python/ISF_FastCaloSimServicesConfigNew.py", "Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/ISF_FatrasConfig.py"], "MergeRecoTimingObjTool": ["Simulation/G4Utilities/MCTruthSimAlgs/python/MCTruthSimAlgsConfigNew.py", "Simulation/G4Utilities/MCTruthSimAlgs/python/RecoTimingConfig.py"], "FlavorTagDiscriminants.BTagDecoratorAlg": ["PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/HighLevelBTagAlgConfig.py", "PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagHighLevelAugmenterAlgConfig.py"], "AsgElectronLikelihoodTool": ["Reconstruction/MET/METUtilities/python/METMakerConfig.py", "Reconstruction/MET/METUtilities/python/ORMETMakerConfig.py"], "AsgPhotonIsEMSelector": ["Reconstruction/MET/METUtilities/python/METMakerConfig.py", "Reconstruction/MET/METUtilities/python/ORMETMakerConfig.py"], "TrackDepositInCaloTool": ["Reconstruction/eflowRec/python/PFHLTConfig.py", "Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py"], "CaloMuonScoreTool": ["Reconstruction/eflowRec/python/PFHLTConfig.py", "Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py"], "CaloMuonTag": ["Reconstruction/eflowRec/python/PFHLTConfig.py", "Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py"], "Trk.ParticleCaloExtensionTool": ["Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedReconstructionConfig.py", "Reconstruction/eflowRec/python/PFHLTConfig.py"], "Muon.MuonEDMHelperSvc": ["Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedReconstructionConfig.py", "Event/DumpEventDataToJSON/python/DumpEventDataToJSONConfig.py"], "InDet.SiZvertexMaker_xk": ["InnerDetector/InDetConfig/python/TrackingSiPatternConfig.py", "InnerDetector/InDetConfig/python/TRTExtensionConfig.py"], "SCT_ConditionsSummaryTool": ["InnerDetector/InDetConfig/python/InDetRecToolConfig.py", "InnerDetector/InDetConfig/python/TrackingSiPatternConfig.py"], "InDet.SeedToTrackConversionTool": ["InnerDetector/InDetConfig/python/TrackingSiPatternConfig.py", "InnerDetector/InDetConfig/python/TRTExtensionConfig.py"], "InDet.SiSPSeededTrackFinder": ["InnerDetector/InDetConfig/python/TrackingSiPatternConfig.py", "InnerDetector/InDetConfig/python/TRTExtensionConfig.py"], "SCT_CablingTool": ["InnerDetector/InDetConfig/python/InDetRecToolConfig.py", "InnerDetector/InDetDetDescr/SCT_Cabling/python/TestSCT_CablingConfig.py"], "PixelAlignCondAlg": ["InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/ITkPixelConditionsConfig.py", "InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py"], "PixelChargeCalibCondAlg": ["InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/ITkPixelConditionsConfig.py", "InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py"], "PixelChargeLUTCalibCondAlg": ["InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/ITkPixelConditionsConfig.py", "InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py"], "PixelDCSCondHVAlg": ["InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/ITkPixelConditionsConfig.py", "InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py"], "PixelDCSCondStateAlg": ["InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/ITkPixelConditionsConfig.py", "InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py"], "PixelDCSCondStatusAlg": ["InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/ITkPixelConditionsConfig.py", "InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py"], "PixelDCSCondTempAlg": ["InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/ITkPixelConditionsConfig.py", "InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py"], "PixelDeadMapCondAlg": ["InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/ITkPixelConditionsConfig.py", "InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py"], "PixelDetectorElementCondAlg": ["InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/ITkPixelConditionsConfig.py", "InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py"], "PixelDistortionAlg": ["InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/ITkPixelConditionsConfig.py", "InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py"], "PixelConditionsSummaryTool": ["InnerDetector/InDetConditions/PixelConditionsTools/python/PixelConditionsSummaryConfig.py", "InnerDetector/InDetConditions/PixelConditionsTools/python/ITkPixelConditionsSummaryConfig.py"], "DetDescrDBEnvelopeSvc": ["AtlasGeometryCommon/SubDetectorEnvelopes/python/SubDetectorEnvelopesConfig.py", "Simulation/ISF/ISF_Geant4/ISF_Geant4Services/python/ISF_Geant4ServicesConfigNew.py"]}
diff --git a/Control/AthenaMonitoring/python/AthenaMonitoringAODRecoCfg.py b/Control/AthenaMonitoring/python/AthenaMonitoringAODRecoCfg.py
index e017edb997f7..d6c90d14b349 100644
--- a/Control/AthenaMonitoring/python/AthenaMonitoringAODRecoCfg.py
+++ b/Control/AthenaMonitoring/python/AthenaMonitoringAODRecoCfg.py
@@ -40,7 +40,7 @@ def AthenaMonitoringAODRecoCfg(flags):
result.merge(AtlasGeometryCfg(flags))
from BeamSpotConditions.BeamSpotConditionsConfig import BeamSpotCondAlgCfg
result.merge(BeamSpotCondAlgCfg(flags))
- from BTagging.BTagRun3Config import BTagRecoSplitCfg
+ from BTagging.BTagConfig import BTagRecoSplitCfg
# would rather use removesuffix below but need to wait for Python 3.9
for container in jet_collections & btag_jet_collections:
result.merge(BTagRecoSplitCfg(flags, [container]))
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY1.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY1.py
index 476daadbfe10..c9cd00b09ec6 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY1.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY1.py
@@ -153,7 +153,7 @@ def BPHY1Cfg(ConfigFlags):
if ConfigFlags.Input.isMC :
AllVariables += ["TruthEvents","TruthParticles","TruthVertices","MuonTruthParticles"]
- BPHY1SlimmingHelper = SlimmingHelper("BPHY1SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections)
+ BPHY1SlimmingHelper = SlimmingHelper("BPHY1SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections, ConfigFlags = ConfigFlags)
# Needed for trigger objects
BPHY1SlimmingHelper.IncludeMuonTriggerContent = True
BPHY1SlimmingHelper.IncludeBPhysTriggerContent = True
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY10.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY10.py
index a2a0682208c0..d1f3a336e7b7 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY10.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY10.py
@@ -253,7 +253,7 @@ def BPHY10Cfg(ConfigFlags):
ThinningTools = []))
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
- BPHY10SlimmingHelper = SlimmingHelper("BPHY10SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections)
+ BPHY10SlimmingHelper = SlimmingHelper("BPHY10SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections, ConfigFlags = ConfigFlags)
from DerivationFrameworkBPhys.commonBPHYMethodsCfg import getDefaultAllVariables
AllVariables = getDefaultAllVariables()
StaticContent = []
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY12.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY12.py
index 94955de7cd4e..040cbc94ff28 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY12.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY12.py
@@ -185,7 +185,7 @@ def BPHY12Cfg(ConfigFlags):
for t in augTools + skimTools + BPHY12ThinningTools : acc.addPublicTool(t)
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
- BPHY12SlimmingHelper = SlimmingHelper("BPHY12SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections)
+ BPHY12SlimmingHelper = SlimmingHelper("BPHY12SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections, ConfigFlags = ConfigFlags)
from DerivationFrameworkBPhys.commonBPHYMethodsCfg import getDefaultAllVariables
AllVariables = getDefaultAllVariables()
StaticContent = []
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY13.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY13.py
index bf4f3446933f..95f40071aba2 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY13.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY13.py
@@ -413,7 +413,7 @@ def BPHY13Cfg(ConfigFlags):
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
- BPHY13SlimmingHelper = SlimmingHelper("BPHY13SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections)
+ BPHY13SlimmingHelper = SlimmingHelper("BPHY13SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections, ConfigFlags = ConfigFlags)
from DerivationFrameworkBPhys.commonBPHYMethodsCfg import getDefaultAllVariables
BPHY13_AllVariables = getDefaultAllVariables()
BPHY13_StaticContent = []
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY15.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY15.py
index 0615b10a96ec..25827eeb21c6 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY15.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY15.py
@@ -498,7 +498,7 @@ def BPHY15Cfg(ConfigFlags):
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
- BPHY15SlimmingHelper = SlimmingHelper("BPHY15SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections)
+ BPHY15SlimmingHelper = SlimmingHelper("BPHY15SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections, ConfigFlags = ConfigFlags)
from DerivationFrameworkBPhys.commonBPHYMethodsCfg import getDefaultAllVariables
AllVariables = getDefaultAllVariables()
StaticContent = []
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY16.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY16.py
index e2cee16c3f1b..4b254945ba28 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY16.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY16.py
@@ -145,7 +145,7 @@ def BPHY16Cfg(ConfigFlags):
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
- BPHY16SlimmingHelper = SlimmingHelper("BPHY16SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections)
+ BPHY16SlimmingHelper = SlimmingHelper("BPHY16SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections, ConfigFlags = ConfigFlags)
from DerivationFrameworkBPhys.commonBPHYMethodsCfg import getDefaultAllVariables
AllVariables = getDefaultAllVariables()
StaticContent = []
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY18.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY18.py
index e98b3db7689e..8b0724556e3e 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY18.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY18.py
@@ -280,7 +280,7 @@ def BPHY18Cfg(ConfigFlags):
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
- BPHY18SlimmingHelper = SlimmingHelper("BPHY18SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections)
+ BPHY18SlimmingHelper = SlimmingHelper("BPHY18SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections, ConfigFlags = ConfigFlags)
from DerivationFrameworkBPhys.commonBPHYMethodsCfg import getDefaultAllVariables
AllVariables = getDefaultAllVariables()
StaticContent = []
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY2.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY2.py
index 9d90dd288897..dfb1e0204318 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY2.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY2.py
@@ -173,7 +173,7 @@ def BPHY2Cfg(ConfigFlags):
for t in augCollection + thiningCollection : acc.addPublicTool(t)
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
- BPHY2SlimmingHelper = SlimmingHelper("BPHY2SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections)
+ BPHY2SlimmingHelper = SlimmingHelper("BPHY2SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections, ConfigFlags = ConfigFlags)
from DerivationFrameworkBPhys.commonBPHYMethodsCfg import getDefaultAllVariables
AllVariables = getDefaultAllVariables()
StaticContent = []
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY21.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY21.py
index 4e9995b049ba..6de0d6b24965 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY21.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY21.py
@@ -118,7 +118,7 @@ def BPHY21Cfg(ConfigFlags):
#====================================================================
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
- BPHY21_SlimmingHelper = SlimmingHelper("BPHY21_SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections)
+ BPHY21_SlimmingHelper = SlimmingHelper("BPHY21_SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections, ConfigFlags = ConfigFlags)
from DerivationFrameworkBPhys.commonBPHYMethodsCfg import getDefaultAllVariables
BPHY21_AllVariables = getDefaultAllVariables()
BPHY21_StaticContent = []
@@ -165,4 +165,4 @@ def BPHY21Cfg(ConfigFlags):
BPHY21_SlimmingHelper.StaticContent = BPHY21_StaticContent
acc.merge(OutputStreamCfg(ConfigFlags, "DAOD_BPHY21", ItemList=BPHY21_SlimmingHelper.GetItemList(), AcceptAlgs=["BPHY21Kernel"]))
acc.printConfig(withDetails=True, summariseProps=True, onlyComponents = [], printDefaults=True, printComponentsOnly=False)
- return acc
\ No newline at end of file
+ return acc
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY22.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY22.py
index d79a914cc905..bc52c842e130 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY22.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY22.py
@@ -274,7 +274,7 @@ def BPHY22Cfg(ConfigFlags):
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
- BPHY22SlimmingHelper = SlimmingHelper("BPHY22SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections)
+ BPHY22SlimmingHelper = SlimmingHelper("BPHY22SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections, ConfigFlags = ConfigFlags)
# Needed for trigger objects
BPHY22SlimmingHelper.IncludeMuonTriggerContent = True
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY3.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY3.py
index 07a912e48423..3e1d9d0421db 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY3.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY3.py
@@ -123,7 +123,7 @@ def BPHY3Cfg(ConfigFlags):
for t in augCollections +BPHY3ThinningTools +skimCollections : acc.addPublicTool(t)
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
- BPHY3SlimmingHelper = SlimmingHelper("BPHY3SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections)
+ BPHY3SlimmingHelper = SlimmingHelper("BPHY3SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections, ConfigFlags = ConfigFlags)
from DerivationFrameworkBPhys.commonBPHYMethodsCfg import getDefaultAllVariables
AllVariables = getDefaultAllVariables()
StaticContent = []
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY4.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY4.py
index 7e64065a47e8..72b5aed9da41 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY4.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY4.py
@@ -70,7 +70,7 @@ def BPHY4Cfg(ConfigFlags):
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
- BPHY4SlimmingHelper = SlimmingHelper("BPHY4SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections)
+ BPHY4SlimmingHelper = SlimmingHelper("BPHY4SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections, ConfigFlags = ConfigFlags)
from DerivationFrameworkBPhys.commonBPHYMethodsCfg import getDefaultAllVariables
BPHY4AllVariables = getDefaultAllVariables()
BPHY4StaticContent = []
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY5.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY5.py
index 6386c787bc3f..32c271f69a9e 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY5.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY5.py
@@ -309,7 +309,7 @@ def BPHY5Cfg(ConfigFlags):
for t in augTools : acc.addPublicTool(t)
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
- BPHY5SlimmingHelper = SlimmingHelper("BPHY5SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections)
+ BPHY5SlimmingHelper = SlimmingHelper("BPHY5SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections, ConfigFlags = ConfigFlags)
from DerivationFrameworkBPhys.commonBPHYMethodsCfg import getDefaultAllVariables
AllVariables = getDefaultAllVariables()
StaticContent = []
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY6.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY6.py
index 61db6ffc3e6f..7826d4e7db00 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY6.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY6.py
@@ -162,7 +162,7 @@ def BPHY6Cfg(ConfigFlags):
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
- BPHY6SlimmingHelper = SlimmingHelper("BPHY6SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections)
+ BPHY6SlimmingHelper = SlimmingHelper("BPHY6SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections, ConfigFlags = ConfigFlags)
# Needed for trigger objects
BPHY6SlimmingHelper.IncludeMuonTriggerContent = True
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/SlimmingHelper.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/SlimmingHelper.py
index cd55dd166c8d..e279a9decb9f 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/SlimmingHelper.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/SlimmingHelper.py
@@ -93,6 +93,7 @@ class SlimmingHelper:
self.SmartCollections = lockable_list()
self.AllVariables = lockable_list() # Containers for which all branches should be kept
self.AppendToDictionary = {}
+ self.ConfigFlags = kwargs.pop("ConfigFlags", None) # Config flags to be set in CA configs
self.IncludeTriggerNavigation = True
self.IncludeAdditionalTriggerContent = False
self.IncludeMuonTriggerContent = False
@@ -486,55 +487,55 @@ class SlimmingHelper:
items.extend(AntiKtVR30Rmax4Rmin02PV0TrackJetsCPContent)
elif collectionName=="BTagging_AntiKt4EMPFlow":
from DerivationFrameworkFlavourTag.BTaggingContent import BTaggingStandardContent
- items.extend(BTaggingStandardContent("AntiKt4EMPFlowJets"))
+ items.extend(BTaggingStandardContent("AntiKt4EMPFlowJets", self.ConfigFlags))
elif collectionName=="BTagging_AntiKt4EMPFlow_expert":
from DerivationFrameworkFlavourTag.BTaggingContent import BTaggingExpertContent
- items.extend(BTaggingExpertContent("AntiKt4EMPFlowJets"))
+ items.extend(BTaggingExpertContent("AntiKt4EMPFlowJets", self.ConfigFlags))
elif collectionName=="BTagging_AntiKt4EMTopo":
from DerivationFrameworkFlavourTag.BTaggingContent import BTaggingStandardContent
- items.extend(BTaggingStandardContent("AntiKt4EMTopoJets"))
+ items.extend(BTaggingStandardContent("AntiKt4EMTopoJets", self.ConfigFlags))
elif collectionName=="BTagging_AntiKtVR30Rmax4Rmin02Track":
from DerivationFrameworkFlavourTag.BTaggingContent import BTaggingStandardContent
- items.extend(BTaggingStandardContent("AntiKtVR30Rmax4Rmin02PV0TrackJets"))
+ items.extend(BTaggingStandardContent("AntiKtVR30Rmax4Rmin02PV0TrackJets", self.ConfigFlags))
elif collectionName=="BTagging_AntiKtVR30Rmax4Rmin02Track_expert":
from DerivationFrameworkFlavourTag.BTaggingContent import BTaggingExpertContent
- items.extend(BTaggingExpertContent("AntiKtVR30Rmax4Rmin02PV0TrackJets"))
+ items.extend(BTaggingExpertContent("AntiKtVR30Rmax4Rmin02PV0TrackJets", self.ConfigFlags))
elif collectionName=="BTagging_AntiKt2Track":
from DerivationFrameworkFlavourTag.BTaggingContent import BTaggingStandardContent
- items.extend(BTaggingStandardContent("AntiKt2PV0TrackJets"))
+ items.extend(BTaggingStandardContent("AntiKt2PV0TrackJets", self.ConfigFlags))
elif collectionName=="BTagging_AntiKt3Track":
from DerivationFrameworkFlavourTag.BTaggingContent import BTaggingStandardContent
- items.extend(BTaggingStandardContent("AntiKt3PV0TrackJets"))
+ items.extend(BTaggingStandardContent("AntiKt3PV0TrackJets", self.ConfigFlags))
elif collectionName=="BTagging_AntiKt4Track":
from DerivationFrameworkFlavourTag.BTaggingContent import BTaggingStandardContent
- items.extend(BTaggingStandardContent("AntiKt4PV0TrackJets"))
+ items.extend(BTaggingStandardContent("AntiKt4PV0TrackJets", self.ConfigFlags))
elif collectionName=="BTagging_AntiKt8EMTopoExKt2Sub":
from DerivationFrameworkFlavourTag.BTaggingContent import BTaggingExpertContent
- items.extend(BTaggingExpertContent("AntiKt8EMTopoExKt2SubJets"))
+ items.extend(BTaggingExpertContent("AntiKt8EMTopoExKt2SubJets", self.ConfigFlags))
elif collectionName=="BTagging_AntiKt8EMTopoExKt3Sub":
from DerivationFrameworkFlavourTag.BTaggingContent import BTaggingExpertContent
- items.extend(BTaggingExpertContent("AntiKt8EMTopoExKt3SubJets"))
+ items.extend(BTaggingExpertContent("AntiKt8EMTopoExKt3SubJets", self.ConfigFlags))
elif collectionName=="BTagging_AntiKt8EMTopoExCoM2Sub":
from DerivationFrameworkFlavourTag.BTaggingContent import BTaggingExpertContent
- items.extend(BTaggingExpertContent("AntiKt8EMTopoExCoM2SubJets"))
+ items.extend(BTaggingExpertContent("AntiKt8EMTopoExCoM2SubJets", self.ConfigFlags))
elif collectionName=="BTagging_AntiKt8EMPFlowExKt2Sub":
from DerivationFrameworkFlavourTag.BTaggingContent import BTaggingExpertContent
- items.extend(BTaggingExpertContent("AntiKt8EMPFlowExKt2SubJets"))
+ items.extend(BTaggingExpertContent("AntiKt8EMPFlowExKt2SubJets", self.ConfigFlags))
elif collectionName=="BTagging_AntiKt8EMPFlowExKt3Sub":
from DerivationFrameworkFlavourTag.BTaggingContent import BTaggingExpertContent
- items.extend(BTaggingExpertContent("AntiKt8EMPFlowExKt3SubJets"))
+ items.extend(BTaggingExpertContent("AntiKt8EMPFlowExKt3SubJets", self.ConfigFlags))
elif collectionName=="BTagging_AntiKt8EMPFlowExKt2GASub":
from DerivationFrameworkFlavourTag.BTaggingContent import BTaggingExpertContent
- items.extend(BTaggingExpertContent("AntiKt8EMPFlowExKt2GASubJets"))
+ items.extend(BTaggingExpertContent("AntiKt8EMPFlowExKt2GASubJets", self.ConfigFlags))
elif collectionName=="BTagging_AntiKt8EMPFlowExKt3GASub":
from DerivationFrameworkFlavourTag.BTaggingContent import BTaggingExpertContent
- items.extend(BTaggingExpertContent("AntiKt8EMPFlowExKt3GASubJets"))
+ items.extend(BTaggingExpertContent("AntiKt8EMPFlowExKt3GASubJets", self.ConfigFlags))
elif collectionName=="BTagging_DFAntiKt4HI":
from DerivationFrameworkFlavourTag.BTaggingContent import BTaggingStandardContent
- items.extend(BTaggingStandardContent("DFAntiKt4HIJets"))
+ items.extend(BTaggingStandardContent("DFAntiKt4HIJets", self.ConfigFlags))
elif collectionName=="BTagging_AntiKt4HI":
from DerivationFrameworkFlavourTag.BTaggingContent import BTaggingStandardContent
- items.extend(BTaggingStandardContent("AntiKt4HIJets"))
+ items.extend(BTaggingStandardContent("AntiKt4HIJets", self.ConfigFlags))
elif collectionName=="InDetTrackParticles":
from DerivationFrameworkInDet.InDetTrackParticlesCPContent import InDetTrackParticlesCPContent
items.extend(InDetTrackParticlesCPContent)
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM1.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM1.py
index daf21ae31ae2..620a5c703ddb 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM1.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM1.py
@@ -473,7 +473,8 @@ def EGAM1Cfg(ConfigFlags):
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
EGAM1SlimmingHelper = SlimmingHelper(
'EGAM1SlimmingHelper',
- NamesAndTypes = ConfigFlags.Input.TypedCollections )
+ NamesAndTypes = ConfigFlags.Input.TypedCollections,
+ ConfigFlags = ConfigFlags)
# ------------------------------------------
# containers for which we save all variables
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM10.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM10.py
index ea19ec8a3ba3..74094a08b087 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM10.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM10.py
@@ -234,7 +234,8 @@ def EGAM10Cfg(ConfigFlags):
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
EGAM10SlimmingHelper = SlimmingHelper(
'EGAM10SlimmingHelper',
- NamesAndTypes = ConfigFlags.Input.TypedCollections )
+ NamesAndTypes = ConfigFlags.Input.TypedCollections,
+ ConfigFlags = ConfigFlags )
# ------------------------------------------
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM2.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM2.py
index 2261df0592c6..65fe9fb44db2 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM2.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM2.py
@@ -345,7 +345,8 @@ def EGAM2Cfg(ConfigFlags):
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
EGAM2SlimmingHelper = SlimmingHelper(
'EGAM2SlimmingHelper',
- NamesAndTypes = ConfigFlags.Input.TypedCollections )
+ NamesAndTypes = ConfigFlags.Input.TypedCollections,
+ ConfigFlags = ConfigFlags )
# ------------------------------------------
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM3.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM3.py
index 6123c4eb4a5b..598ec1627d7f 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM3.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM3.py
@@ -404,7 +404,8 @@ def EGAM3Cfg(ConfigFlags):
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
EGAM3SlimmingHelper = SlimmingHelper(
'EGAM3SlimmingHelper',
- NamesAndTypes = ConfigFlags.Input.TypedCollections )
+ NamesAndTypes = ConfigFlags.Input.TypedCollections,
+ ConfigFlags = ConfigFlags )
# ------------------------------------------
# containers for which we save all variables
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM4.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM4.py
index c21fc08b5ef7..c7b19f5bad6b 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM4.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM4.py
@@ -309,7 +309,8 @@ def EGAM4Cfg(ConfigFlags):
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
EGAM4SlimmingHelper = SlimmingHelper(
'EGAM4SlimmingHelper',
- NamesAndTypes = ConfigFlags.Input.TypedCollections )
+ NamesAndTypes = ConfigFlags.Input.TypedCollections,
+ ConfigFlags = ConfigFlags )
# ------------------------------------------
# containers for which we save all variables
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM5.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM5.py
index b1913e81756b..7021869510cd 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM5.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM5.py
@@ -333,7 +333,8 @@ def EGAM5Cfg(ConfigFlags):
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
EGAM5SlimmingHelper = SlimmingHelper(
'EGAM5SlimmingHelper',
- NamesAndTypes = ConfigFlags.Input.TypedCollections )
+ NamesAndTypes = ConfigFlags.Input.TypedCollections,
+ ConfigFlags = ConfigFlags )
# ------------------------------------------
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM7.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM7.py
index e36c09b6d688..dba919c74cd3 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM7.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM7.py
@@ -328,7 +328,8 @@ def EGAM7Cfg(ConfigFlags):
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
EGAM7SlimmingHelper = SlimmingHelper(
'EGAM7SlimmingHelper',
- NamesAndTypes = ConfigFlags.Input.TypedCollections )
+ NamesAndTypes = ConfigFlags.Input.TypedCollections,
+ ConfigFlags = ConfigFlags )
# ------------------------------------------
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM8.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM8.py
index a8b1ab220b2a..a3e9598f8a0e 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM8.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM8.py
@@ -355,7 +355,8 @@ def EGAM8Cfg(ConfigFlags):
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
EGAM8SlimmingHelper = SlimmingHelper(
'EGAM8SlimmingHelper',
- NamesAndTypes = ConfigFlags.Input.TypedCollections )
+ NamesAndTypes = ConfigFlags.Input.TypedCollections,
+ ConfigFlags = ConfigFlags )
# ------------------------------------------
# containers for which we save all variables
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM9.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM9.py
index 65792e56430a..fb00aa42edc6 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM9.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGAM9.py
@@ -280,7 +280,8 @@ def EGAM9Cfg(ConfigFlags):
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
EGAM9SlimmingHelper = SlimmingHelper(
'EGAM9SlimmingHelper',
- NamesAndTypes = ConfigFlags.Input.TypedCollections )
+ NamesAndTypes = ConfigFlags.Input.TypedCollections,
+ ConfigFlags = ConfigFlags)
# ------------------------------------------
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/share/EGAM6.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/share/EGAM6.py
index 6b9941db8aee..c6e8ecf01553 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/share/EGAM6.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/share/EGAM6.py
@@ -415,7 +415,7 @@ addDAODJets(jetList, EGAM6Sequence)
#====================================================================
# FLAVOUR TAGGING
#====================================================================
-from DerivationFrameworkFlavourTag.FtagRun3DerivationConfig import FtagJetCollection
+from DerivationFrameworkFlavourTag.FtagDerivationConfig import FtagJetCollection
FtagJetCollection('AntiKt4EMPFlowJets',EGAM6Sequence)
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/share/EGAM7.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/share/EGAM7.py
index 413310fe5501..7c0988683511 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/share/EGAM7.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/share/EGAM7.py
@@ -276,7 +276,7 @@ addDAODJets(jetList, EGAM7Sequence)
# FLAVOUR TAGGING
#====================================================================
#not available yet in r22
-#from DerivationFrameworkFlavourTag.FtagRun3DerivationConfig import FtagJetCollections
+#from DerivationFrameworkFlavourTag.FtagDerivationConfig import FtagJetCollections
#FtagJetCollections(['AntiKt4PV0TrackJets'], EGAM7Sequence)
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExamples/python/TEST1.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExamples/python/TEST1.py
index 6e42d939a0b5..81620551af39 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExamples/python/TEST1.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExamples/python/TEST1.py
@@ -31,7 +31,7 @@ def TEST1Cfg(ConfigFlags):
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
- TEST1SlimmingHelper = SlimmingHelper("TEST1SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections)
+ TEST1SlimmingHelper = SlimmingHelper("TEST1SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections, ConfigFlags = ConfigFlags)
TEST1SlimmingHelper.SmartCollections = ["EventInfo",
"Electrons",
"Photons",
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExamples/python/TEST2.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExamples/python/TEST2.py
index d8cdca051d75..f2bc2dcbeb6d 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExamples/python/TEST2.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExamples/python/TEST2.py
@@ -32,7 +32,7 @@ def TEST2Cfg(ConfigFlags):
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
- TEST2SlimmingHelper = SlimmingHelper("TEST2SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections)
+ TEST2SlimmingHelper = SlimmingHelper("TEST2SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections, ConfigFlags = ConfigFlags)
TEST2SlimmingHelper.SmartCollections = ["EventInfo",
"Electrons",
"Photons",
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExamples/python/TEST3.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExamples/python/TEST3.py
index 39b855ab7dde..3112236030f5 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExamples/python/TEST3.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExamples/python/TEST3.py
@@ -31,7 +31,7 @@ def TEST3Cfg(ConfigFlags):
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
- TEST3SlimmingHelper = SlimmingHelper("TEST3SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections)
+ TEST3SlimmingHelper = SlimmingHelper("TEST3SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections, ConfigFlags = ConfigFlags)
TEST3SlimmingHelper.SmartCollections = ["EventInfo","InDetTrackParticles"]
TEST3ItemList = TEST3SlimmingHelper.GetItemList()
acc.merge(OutputStreamCfg(ConfigFlags, "DAOD_TEST3", ItemList=TEST3ItemList, AcceptAlgs=["TEST3Kernel"]))
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExamples/python/TEST4.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExamples/python/TEST4.py
index 6c2825b190b8..6aa193f57a0d 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExamples/python/TEST4.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExamples/python/TEST4.py
@@ -21,7 +21,7 @@ def TEST4Cfg(ConfigFlags):
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
- TEST4SlimmingHelper = SlimmingHelper("TEST4SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections)
+ TEST4SlimmingHelper = SlimmingHelper("TEST4SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections, ConfigFlags = ConfigFlags)
TEST4SlimmingHelper.SmartCollections = ["EventInfo",
"Electrons",
"Photons",
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExamples/python/TEST5.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExamples/python/TEST5.py
index e99ec39fb675..535632b357c6 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExamples/python/TEST5.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExamples/python/TEST5.py
@@ -46,7 +46,7 @@ def TEST5Cfg(ConfigFlags):
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
- TEST5SlimmingHelper = SlimmingHelper("TEST5SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections)
+ TEST5SlimmingHelper = SlimmingHelper("TEST5SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections, ConfigFlags = ConfigFlags)
TEST5SlimmingHelper.SmartCollections = ["EventInfo","InDetTrackParticles","PrimaryVertices","Muons"]
TEST5SlimmingHelper.ExtraVariables += ["InDetTrackParticles.DFDecoratorExample"]
TEST5SlimmingHelper.ExtraVariables += ["Muons.TEST5GoodMuons"]
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExamples/python/TEST6.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExamples/python/TEST6.py
index f28aa0c5b979..b8f61708cfc9 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExamples/python/TEST6.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExamples/python/TEST6.py
@@ -47,7 +47,7 @@ def TEST6Cfg(ConfigFlags):
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
- TEST6SlimmingHelper = SlimmingHelper("TEST6SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections)
+ TEST6SlimmingHelper = SlimmingHelper("TEST6SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections, ConfigFlags = ConfigFlags)
TEST6SlimmingHelper.SmartCollections = ["EventInfo",
"Electrons",
"Photons",
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/python/BTaggingContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/python/BTaggingContent.py
index eeb11581fd69..fe1ce8f7c291 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/python/BTaggingContent.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/python/BTaggingContent.py
@@ -1,5 +1,7 @@
# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+from AthenaConfiguration.Enums import LHCPeriod
+
# from
# https://stackoverflow.com/questions/3663450/python-remove-substring-only-at-the-end-of-string
def rchop(thestring, ending):
@@ -19,7 +21,7 @@ JetStandardAux = \
, "ConeExclCHadronsFinal"
]
-BTaggingStandardAux = \
+BTaggingStandardRun3Aux = \
[
"DL1r_pu"
, "DL1r_pc"
@@ -64,6 +66,24 @@ BTaggingStandardAux = \
]
+BTaggingStandardRun4Aux = [
+ "SV1_NGTinSvx",
+ "SV1_masssvx",
+
+ "dipsrun420221008_pu",
+ "dipsrun420221008_pc",
+ "dipsrun420221008_pb",
+
+ "DL1drun420221017_pu",
+ "DL1drun420221017_pc",
+ "DL1drun420221017_pb",
+
+ "GN1run420221010_pu",
+ "GN1run420221010_pc",
+ "GN1run420221010_pb"
+]
+
+
# These are the inputs to DL1rmu + SMT
BTaggingHighLevelAux = [
"softMuon_dR",
@@ -84,8 +104,6 @@ BTaggingHighLevelAux = [
"JetFitter_nTracksAtVtx",
"JetFitter_N2Tpair",
"JetFitter_deltaR",
- "SV1_NGTinSvx",
- "SV1_masssvx",
"SV1_isDefaults",
"SV1_N2Tpair",
"SV1_efracsvx",
@@ -123,51 +141,25 @@ BTaggingHighLevelAux = [
"softMuon_pc",
"softMuon_pu",
"softMuon_isDefaults"
- , "DL1r20210519r22_pu"
- , "DL1r20210519r22_pc"
- , "DL1r20210519r22_pb"
- , "DL1r20210824r22_pu"
- , "DL1r20210824r22_pc"
- , "DL1r20210824r22_pb"
-
- , "dipsLoose20210729_pu"
- , "dipsLoose20210729_pc"
- , "dipsLoose20210729_pb"
- , "dipsLoose20220314v2_pu"
- , "dipsLoose20220314v2_pc"
- , "dipsLoose20220314v2_pb"
+]
- , "dips20210729_pu"
- , "dips20210729_pc"
- , "dips20210729_pb"
+BTaggingHighLevelRun3Aux = BTaggingHighLevelAux \
+ + [ "DL1r20210519r22_pu"
+ , "DL1r20210519r22_pc"
+ , "DL1r20210519r22_pb"
+ , "DL1r20210824r22_pu"
+ , "DL1r20210824r22_pc"
+ , "DL1r20210824r22_pb"
- , "DL1dv00_pu" #“recommended r22 tagger†which is DL1dLoose20210824r22 named DL1dv00
- , "DL1dv00_pc"
- , "DL1dv00_pb"
- , "DL1dv01_pu" # new recommended r22 tagger named DL1dv01 which is DL1dLoose20220509
- , "DL1dv01_pc"
- , "DL1dv01_pb"
+ , "dips20210729_pu"
+ , "dips20210729_pc"
+ , "dips20210729_pb"
- , "DL1d20210824r22_pu"
- , "DL1d20210824r22_pc"
- , "DL1d20210824r22_pb"
+ , "DL1d20210824r22_pu"
+ , "DL1d20210824r22_pc"
+ , "DL1d20210824r22_pb" ]
- , "GN120220509_pb"
- , "GN120220509_pc"
- , "GN120220509_pu"
-
-]
-
-BTaggingXbbAux = [
- 'JetFitter_N2Tpair','JetFitter_dRFlightDir','JetFitter_deltaeta',
- 'JetFitter_deltaphi', 'JetFitter_energyFraction', 'JetFitter_mass',
- 'JetFitter_massUncorr', 'JetFitter_nSingleTracks',
- 'JetFitter_nTracksAtVtx',
- 'JetFitter_nVTX', 'JetFitter_significance3d',
- 'SV1_L3d','SV1_Lxy','SV1_N2Tpair','SV1_NGTinSvx','SV1_deltaR',
- 'SV1_dstToMatLay', 'SV1_efracsvx', 'SV1_masssvx', 'SV1_significance3d',
- 'rnnip_pb','rnnip_pc','rnnip_ptau','rnnip_pu'
-]
+BTaggingHighLevelRun4Aux = BTaggingHighLevelAux
JetGhostLabelAux = [
"GhostBHadronsFinalCount",
@@ -189,7 +181,7 @@ JetExtendedAux = [
"GhostTrack",
]
-def BTaggingExpertContent(jetcol):
+def BTaggingExpertContent(jetcol, ConfigFlags = None):
btaggingtmp = "BTagging_" + jetcol.split('Jets')[0]
if 'BTagging' in jetcol:
@@ -202,16 +194,20 @@ def BTaggingExpertContent(jetcol):
jetAllAux = JetStandardAux + JetExtendedAux
jetcontent = [ ".".join( [ jetcol + "Aux" ] + jetAllAux ) ]
+ isRun4 = False
+ if ConfigFlags is not None:
+ isRun4 = ConfigFlags.GeoModel.Run >= LHCPeriod.Run4
+
# add aux variables
- btaggingAllAux = (BTaggingHighLevelAux
- + BTaggingStandardAux
+ btaggingAllAux = ( BTaggingHighLevelRun4Aux if isRun4 else BTaggingHighLevelRun3Aux
+ + BTaggingStandardRun4Aux if isRun4 else BTaggingStandardRun3Aux
+ BTaggingExtendedAux)
btagcontent = [ ".".join( [ btagging + "Aux" ] + btaggingAllAux ) ]
return [jetcol] + jetcontent + [ btagging ] + btagcontent
-def BTaggingStandardContent(jetcol):
+def BTaggingStandardContent(jetcol, ConfigFlags = None):
btaggingtmp = "BTagging_" + jetcol.split('Jets')[0]
if 'BTagging' in jetcol:
@@ -224,13 +220,18 @@ def BTaggingStandardContent(jetcol):
[ jetcol ] \
+ [ ".".join( [ jetcol + "Aux" ] + JetStandardAux ) ]
+ isRun4 = False
+ if ConfigFlags is not None:
+ isRun4 = ConfigFlags.GeoModel.Run >= LHCPeriod.Run4
+
btagcontent = \
[ btagging ] \
- + [ ".".join( [ btagging + "Aux" ] + BTaggingStandardAux ) ]
+ + [ ".".join( [ btagging + "Aux" ] + \
+ BTaggingStandardRun4Aux if isRun4 else BTaggingStandardRun3Aux ) ]
return jetcontent + btagcontent
-def BTaggingXbbContent(jetcol):
+def BTaggingXbbContent(jetcol, ConfigFlags = None):
btaggingtmp = "BTagging_" + jetcol.split('Jets')[0]
if 'BTagging' in jetcol:
@@ -243,8 +244,13 @@ def BTaggingXbbContent(jetcol):
jetAllAux = JetStandardAux + JetGhostLabelAux
jetcontent = [ ".".join( [ jetcol + "Aux" ] + jetAllAux ) ]
+ isRun4 = False
+ if ConfigFlags is not None:
+ isRun4 = ConfigFlags.GeoModel.Run >= LHCPeriod.Run4
+
# add aux variables
- btaggingAllAux = BTaggingHighLevelAux + BTaggingStandardAux
+ btaggingAllAux = BTaggingHighLevelRun4Aux if isRun4 else BTaggingHighLevelRun3Aux \
+ + BTaggingStandardRun4Aux if isRun4 else BTaggingStandardRun3Aux
btagcontent = [ ".".join( [ btagging + "Aux" ] + btaggingAllAux ) ]
return [jetcol] + jetcontent + [ btagging ] + btagcontent
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/python/FTAG1.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/python/FTAG1.py
index 83abf033f1d5..b10c97eab228 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/python/FTAG1.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/python/FTAG1.py
@@ -50,7 +50,7 @@ def FTAG1Cfg(ConfigFlags):
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
- FTAG1SlimmingHelper = SlimmingHelper("FTAG1SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections)
+ FTAG1SlimmingHelper = SlimmingHelper("FTAG1SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections, ConfigFlags = ConfigFlags)
FTAG1SlimmingHelper.SmartCollections = [
"Electrons",
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/python/FTAG2.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/python/FTAG2.py
index aa4cb3066e96..a1ab865e7492 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/python/FTAG2.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/python/FTAG2.py
@@ -94,7 +94,7 @@ def FTAG2Cfg(ConfigFlags):
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
- FTAG2SlimmingHelper = SlimmingHelper("FTAG2SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections)
+ FTAG2SlimmingHelper = SlimmingHelper("FTAG2SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections, ConfigFlags = ConfigFlags)
FTAG2SlimmingHelper.SmartCollections = [
"Electrons",
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/python/FtagRun3DerivationConfig.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/python/FtagDerivationConfig.py
similarity index 98%
rename from PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/python/FtagRun3DerivationConfig.py
rename to PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/python/FtagDerivationConfig.py
index 75f17e94349e..32c3cc680900 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/python/FtagRun3DerivationConfig.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/python/FtagDerivationConfig.py
@@ -12,7 +12,7 @@ from AthenaConfiguration.ComponentFactory import CompFactory
# these files are sloppy with imports, see ATLASRECTS-6635
with ConfigurableRun3Behavior():
from BTagging.BTagTrackAugmenterAlgConfig import BTagTrackAugmenterAlgCfg
- from BTagging.BTagRun3Config import BTagAlgsCfg, GetTaggerTrainingMap
+ from BTagging.BTagConfig import BTagAlgsCfg, GetTaggerTrainingMap
# for backward compatability
def FtagJetCollection(jetcol, seq, pvCol='PrimaryVertices', OutputLevel=WARNING):
@@ -145,7 +145,7 @@ def getFtagComponent(cfgFlags, jetcol, pvCol):
acc.merge(BTagAlgsCfg(
inputFlags=cfgFlags,
JetCollection=jetcol_name_without_Jets,
- nnList=GetTaggerTrainingMap(jetcol_name_without_Jets),
+ nnList=GetTaggerTrainingMap(cfgFlags, jetcol_name_without_Jets),
trackCollection=track_collection,
primaryVertices=pvCol,
renameTrackJets=True,
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/python/HIGG1D1.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/python/HIGG1D1.py
index c1ddb5b3cda0..0ea8e0acbf29 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/python/HIGG1D1.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/python/HIGG1D1.py
@@ -29,7 +29,7 @@ def HIGG1D1KernelCfg(ConfigFlags, name='HIGG1D1Kernel', **kwargs):
#CustomJetsConfig
acc.merge(HIGG1D1CustomJetsCfg(ConfigFlags))
- from DerivationFrameworkFlavourTag.FtagRun3DerivationConfig import FtagJetCollectionsCfg
+ from DerivationFrameworkFlavourTag.FtagDerivationConfig import FtagJetCollectionsCfg
acc.merge(FtagJetCollectionsCfg(ConfigFlags, ['AntiKt4EMPFlowCustomVtxJets'], ['HggPrimaryVertices']))
#Custom MET
@@ -205,7 +205,7 @@ def HIGG1D1Cfg(ConfigFlags):
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
- HIGG1D1SlimmingHelper = SlimmingHelper("HIGG1D1SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections)
+ HIGG1D1SlimmingHelper = SlimmingHelper("HIGG1D1SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections, ConfigFlags = ConfigFlags)
HIGG1D1SlimmingHelper.SmartCollections = ["EventInfo",
"Electrons",
"Photons",
@@ -324,10 +324,10 @@ def HIGG1D1Cfg(ConfigFlags):
"AFPToFTrackContainer"]
# Add Btagging information
from DerivationFrameworkFlavourTag.BTaggingContent import BTaggingStandardContent,BTaggingXbbContent
- HIGG1D1SlimmingHelper.ExtraVariables += BTaggingStandardContent("AntiKt4EMPFlowCustomVtxJets")
- HIGG1D1SlimmingHelper.ExtraVariables += BTaggingStandardContent("AntiKt4EMPFlowJets")
- HIGG1D1SlimmingHelper.ExtraVariables += BTaggingXbbContent("AntiKt4EMPFlowCustomVtxJets")
- HIGG1D1SlimmingHelper.ExtraVariables += BTaggingXbbContent("AntiKt4EMPFlowJets")
+ HIGG1D1SlimmingHelper.ExtraVariables += BTaggingStandardContent("AntiKt4EMPFlowCustomVtxJets", ConfigFlags)
+ HIGG1D1SlimmingHelper.ExtraVariables += BTaggingStandardContent("AntiKt4EMPFlowJets", ConfigFlags)
+ HIGG1D1SlimmingHelper.ExtraVariables += BTaggingXbbContent("AntiKt4EMPFlowCustomVtxJets", ConfigFlags)
+ HIGG1D1SlimmingHelper.ExtraVariables += BTaggingXbbContent("AntiKt4EMPFlowJets", ConfigFlags)
# is this really needed given Photons are in the AllVariables list ?
from DerivationFrameworkEGamma.PhotonsCPDetailedContent import PhotonsCPDetailedContent
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG1D1.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG1D1.py
index c50d634ac973..f0d1eb0ff5f3 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG1D1.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG1D1.py
@@ -544,7 +544,7 @@ METCommon.scheduleCustomVtxMETContent(vxColl="Hgg", jetColl="AntiKt4EMPFlowCusto
# FLAVOUR TAGGING ol90
#====================================================;;p================
-from DerivationFrameworkFlavourTag.FtagRun3DerivationConfig import FtagJetCollections
+from DerivationFrameworkFlavourTag.FtagDerivationConfig import FtagJetCollections
#FtagJetCollections(["AntiKt4EMPFlowCustomVtxJets","AntiKt4EMPFlowJets"], SeqHIGG1D1, pvCols=[HggVertexContainerName,"PrimaryVertices"])
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/python/IDTIDE.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/python/IDTIDE.py
index a759bb01b139..520b73ea3345 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/python/IDTIDE.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/python/IDTIDE.py
@@ -328,7 +328,7 @@ def IDTIDECfg(configFlags):
# =============================
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
- IDTIDESlimmingHelper = SlimmingHelper("IDTIDESlimmingHelper", NamesAndTypes = configFlags.Input.TypedCollections)
+ IDTIDESlimmingHelper = SlimmingHelper("IDTIDESlimmingHelper", NamesAndTypes = configFlags.Input.TypedCollections, ConfigFlags = configFlags)
AllVariables = []
StaticContent = []
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/python/IDTR2.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/python/IDTR2.py
index 65cf69dfcfe7..4a475558cea9 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/python/IDTR2.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/python/IDTR2.py
@@ -132,7 +132,7 @@ def IDTR2Cfg(ConfigFlags):
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
- IDTR2SlimmingHelper = SlimmingHelper("IDTR2SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections)
+ IDTR2SlimmingHelper = SlimmingHelper("IDTR2SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections, ConfigFlags = ConfigFlags)
IDTR2SlimmingHelper.AllVariables = [
"EventInfo",
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM1.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM1.py
index c2e7c334670c..93483877beca 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM1.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM1.py
@@ -310,7 +310,7 @@ def JETM1Cfg(ConfigFlags):
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
- JETM1SlimmingHelper = SlimmingHelper("JETM1SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections)
+ JETM1SlimmingHelper = SlimmingHelper("JETM1SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections, ConfigFlags = ConfigFlags)
JETM1SlimmingHelper.SmartCollections = ["Electrons", "Photons", "Muons", "PrimaryVertices",
"InDetTrackParticles",
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM10.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM10.py
index ce7f89edac3d..ce808c5d0472 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM10.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM10.py
@@ -59,7 +59,7 @@ def JETM10Cfg(ConfigFlags):
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
- JETM10SlimmingHelper = SlimmingHelper("JETM10SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections)
+ JETM10SlimmingHelper = SlimmingHelper("JETM10SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections, ConfigFlags = ConfigFlags)
from DerivationFrameworkJetEtMiss.METTriggerDerivationContentConfig import addMETTriggerDerivationContent
addMETTriggerDerivationContent(JETM10SlimmingHelper, isLoose=True)
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM11.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM11.py
index 9ce8e3ee28cb..a70add3b4b56 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM11.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM11.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+4# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
#!/usr/bin/env python
#====================================================================
# DAOD_JETM11.py
@@ -79,7 +79,7 @@ def JETM11Cfg(ConfigFlags):
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
- JETM11SlimmingHelper = SlimmingHelper("JETM11SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections)
+ JETM11SlimmingHelper = SlimmingHelper("JETM11SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections, ConfigFlags = ConfigFlags)
from DerivationFrameworkJetEtMiss.METTriggerDerivationContentConfig import addMETTriggerDerivationContent
addMETTriggerDerivationContent(JETM11SlimmingHelper, isLoose=False)
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM12.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM12.py
index 19f894b17198..ede760fa7ed9 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM12.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM12.py
@@ -216,7 +216,7 @@ def JETM12Cfg(ConfigFlags):
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
- JETM12SlimmingHelper = SlimmingHelper("JETM12SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections)
+ JETM12SlimmingHelper = SlimmingHelper("JETM12SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections, ConfigFlags = ConfigFlags)
JETM12SlimmingHelper.SmartCollections = ["EventInfo",
"Electrons", "Photons", "Muons", "TauJets",
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM14.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM14.py
index db6677994cec..f34b8d709597 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM14.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM14.py
@@ -78,7 +78,7 @@ def JETM14Cfg(ConfigFlags):
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
- JETM14SlimmingHelper = SlimmingHelper("JETM14SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections)
+ JETM14SlimmingHelper = SlimmingHelper("JETM14SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections, ConfigFlags = ConfigFlags)
from DerivationFrameworkJetEtMiss.METTriggerDerivationContentConfig import addMETTriggerDerivationContent
addMETTriggerDerivationContent(JETM14SlimmingHelper, isLoose=True)
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM2.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM2.py
index 94ba6d31e233..7c1447e08ea0 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM2.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM2.py
@@ -111,7 +111,7 @@ def JETM2Cfg(ConfigFlags):
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
- JETM2SlimmingHelper = SlimmingHelper("JETM2SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections)
+ JETM2SlimmingHelper = SlimmingHelper("JETM2SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections, ConfigFlags = ConfigFlags)
JETM2SlimmingHelper.SmartCollections = ["EventInfo",
"Electrons", "Photons", "Muons", "TauJets",
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM3.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM3.py
index aa434c9a9a12..7f057508d4a5 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM3.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM3.py
@@ -220,7 +220,7 @@ def JETM3Cfg(ConfigFlags):
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
- JETM3SlimmingHelper = SlimmingHelper("JETM3SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections)
+ JETM3SlimmingHelper = SlimmingHelper("JETM3SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections, ConfigFlags = ConfigFlags)
JETM3SlimmingHelper.SmartCollections = ["EventInfo",
"Electrons", "Photons", "Muons", "TauJets",
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM4.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM4.py
index 4e0fb65f7184..a5a0cd872e75 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM4.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM4.py
@@ -154,7 +154,7 @@ def JETM4Cfg(ConfigFlags):
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
- JETM4SlimmingHelper = SlimmingHelper("JETM4SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections)
+ JETM4SlimmingHelper = SlimmingHelper("JETM4SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections, ConfigFlags = ConfigFlags)
JETM4SlimmingHelper.SmartCollections = ["EventInfo",
"Electrons", "Photons", "Muons", "TauJets",
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM5.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM5.py
index 7b4dae5401fc..0decd93a1a58 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM5.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM5.py
@@ -118,7 +118,7 @@ def JETM5Cfg(ConfigFlags):
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
- JETM5SlimmingHelper = SlimmingHelper("JETM5SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections)
+ JETM5SlimmingHelper = SlimmingHelper("JETM5SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections, ConfigFlags = ConfigFlags)
JETM5SlimmingHelper.SmartCollections = ["EventInfo",
"Electrons", "Photons", "Muons", "TauJets",
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM6.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM6.py
index ddd22d398479..8f611ff48f09 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM6.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM6.py
@@ -336,7 +336,7 @@ def JETM6Cfg(ConfigFlags):
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
- JETM6SlimmingHelper = SlimmingHelper("JETM6SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections)
+ JETM6SlimmingHelper = SlimmingHelper("JETM6SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections, ConfigFlags = ConfigFlags)
JETM6SlimmingHelper.SmartCollections = ["EventInfo","InDetTrackParticles","PrimaryVertices",
"Electrons","Photons","Muons","TauJets",
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkLLP/python/LLP1.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkLLP/python/LLP1.py
index c325b623f08e..38b961093c3f 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkLLP/python/LLP1.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkLLP/python/LLP1.py
@@ -100,7 +100,7 @@ def LLP1KernelCfg(ConfigFlags, name='LLP1Kernel', **kwargs):
suff="LRT"))
# flavor tagging
- from DerivationFrameworkFlavourTag.FtagRun3DerivationConfig import FtagJetCollectionsCfg
+ from DerivationFrameworkFlavourTag.FtagDerivationConfig import FtagJetCollectionsCfg
acc.merge(FtagJetCollectionsCfg(ConfigFlags, ['AntiKt4EMTopoJets']))
# VrtSecInclusive
@@ -300,7 +300,7 @@ def LLP1Cfg(ConfigFlags):
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
- LLP1SlimmingHelper = SlimmingHelper("LLP1SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections)
+ LLP1SlimmingHelper = SlimmingHelper("LLP1SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections, ConfigFlags = ConfigFlags)
LLP1SlimmingHelper.SmartCollections = ["EventInfo",
"Electrons",
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkLLP/share/LLP1.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkLLP/share/LLP1.py
index eba81810bcf3..b92f75c27ef3 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkLLP/share/LLP1.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkLLP/share/LLP1.py
@@ -369,7 +369,7 @@ SeqLLP1 += CfgMgr.DerivationFramework__DerivationKernel("LLP1Kernel",
# FLAVOUR TAGGING
#====================================================================
-from DerivationFrameworkFlavourTag.FtagRun3DerivationConfig import FtagJetCollections
+from DerivationFrameworkFlavourTag.FtagDerivationConfig import FtagJetCollections
FtagJetCollections(['AntiKt4EMTopoJets'],SeqLLP1)
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/python/TRUTH1.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/python/TRUTH1.py
index 33e12bbf232c..57efbc5e918f 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/python/TRUTH1.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/python/TRUTH1.py
@@ -24,7 +24,7 @@ def TRUTH1Cfg(ConfigFlags):
# Set up slimming content list
#==============================================================================
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
- TRUTH1SlimmingHelper = SlimmingHelper("TRUTH1SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections)
+ TRUTH1SlimmingHelper = SlimmingHelper("TRUTH1SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections, ConfigFlags = ConfigFlags)
TRUTH1SlimmingHelper.AppendToDictionary = {'TruthEvents':'xAOD::TruthEventContainer','TruthEventsAux':'xAOD::TruthEventAuxContainer',
'TruthVertices':'xAOD::TruthVertexContainer','TruthVerticesAux':'xAOD::TruthVertexAuxContainer',
'TruthParticles':'xAOD::TruthParticleContainer','TruthParticlesAux':'xAOD::TruthParticleAuxContainer',
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/python/TRUTH3.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/python/TRUTH3.py
index 7bb72f58c98e..8ae07cace411 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/python/TRUTH3.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/python/TRUTH3.py
@@ -18,7 +18,7 @@ def TRUTH3Cfg(ConfigFlags):
# Set up slimming content list
#==============================================================================
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
- TRUTH3SlimmingHelper = SlimmingHelper("TRUTH3SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections)
+ TRUTH3SlimmingHelper = SlimmingHelper("TRUTH3SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections, ConfigFlags = ConfigFlags)
TRUTH3SlimmingHelper.AppendToDictionary = {'TruthEvents':'xAOD::TruthEventContainer','TruthEventsAux':'xAOD::TruthEventAuxContainer',
'MET_Truth':'xAOD::MissingETContainer','MET_TruthAux':'xAOD::MissingETAuxContainer',
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PHYS.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PHYS.py
index 557c8a2777e3..171fd7796f4f 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PHYS.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PHYS.py
@@ -70,7 +70,7 @@ def PHYSCfg(ConfigFlags):
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
- PHYSSlimmingHelper = SlimmingHelper("PHYSSlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections)
+ PHYSSlimmingHelper = SlimmingHelper("PHYSSlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections, ConfigFlags = ConfigFlags)
PHYSSlimmingHelper.SmartCollections = ["EventInfo",
"Electrons",
"Photons",
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PHYSLITE.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PHYSLITE.py
index c857420d70ca..95021299c46d 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PHYSLITE.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PHYSLITE.py
@@ -180,7 +180,7 @@ def PHYSLITECfg(ConfigFlags):
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
- PHYSLITESlimmingHelper = SlimmingHelper("PHYSLITESlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections)
+ PHYSLITESlimmingHelper = SlimmingHelper("PHYSLITESlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections, ConfigFlags = ConfigFlags)
# Trigger content
PHYSLITESlimmingHelper.IncludeTriggerNavigation = False
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PhysCommon.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PhysCommon.py
index cd4b164d4e98..b3bb762bd002 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PhysCommon.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PhysCommon.py
@@ -114,6 +114,6 @@ addMuonRemovalTauReReco(Seq=DerivationFrameworkJob)
#====================================================================
# FLAVOUR TAGGING
#====================================================================
-from DerivationFrameworkFlavourTag.FtagRun3DerivationConfig import FtagJetCollections
+from DerivationFrameworkFlavourTag.FtagDerivationConfig import FtagJetCollections
FtagJetCollections(['AntiKt4EMPFlowJets','AntiKtVR30Rmax4Rmin02TrackJets'],DerivationFrameworkJob)
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PhysCommonConfig.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PhysCommonConfig.py
index dedf0bfbb782..10ac3f4df126 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PhysCommonConfig.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PhysCommonConfig.py
@@ -66,7 +66,7 @@ def PhysCommonAugmentationsCfg(ConfigFlags,**kwargs):
acc.merge(EGammaCommonCfg(ConfigFlags))
# Jets, di-taus, tau decorations, flavour tagging, MET association
from DerivationFrameworkJetEtMiss.JetCommonConfig import JetCommonCfg
- from DerivationFrameworkFlavourTag.FtagRun3DerivationConfig import FtagJetCollectionsCfg
+ from DerivationFrameworkFlavourTag.FtagDerivationConfig import FtagJetCollectionsCfg
from DerivationFrameworkTau.TauCommonConfig import (AddDiTauLowPtCfg, AddTauWPDecorationCfg, AddMuonRemovalTauAODReRecoAlgCfg)
from DerivationFrameworkJetEtMiss.METCommonConfig import METCommonCfg
acc.merge(JetCommonCfg(ConfigFlags))
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhysicsValidation/python/PHYSVAL.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhysicsValidation/python/PHYSVAL.py
index ec21843d5703..b0157fa8391e 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhysicsValidation/python/PHYSVAL.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhysicsValidation/python/PHYSVAL.py
@@ -48,7 +48,7 @@ def PHYSVALCfg(ConfigFlags):
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
- PHYSVALSlimmingHelper = SlimmingHelper("PHYSVALSlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections)
+ PHYSVALSlimmingHelper = SlimmingHelper("PHYSVALSlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections, ConfigFlags = ConfigFlags)
PHYSVALSlimmingHelper.SmartCollections = ["EventInfo",
"Electrons",
"Photons",
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhysicsValidation/share/PHYSVAL.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhysicsValidation/share/PHYSVAL.py
index 030867abda2b..d215fb82df40 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhysicsValidation/share/PHYSVAL.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhysicsValidation/share/PHYSVAL.py
@@ -166,7 +166,7 @@ DerivationFrameworkJob += CfgMgr.DerivationFramework__DerivationKernel("PHYSVALK
# FLAVOUR TAGGING
#====================================================================
-from DerivationFrameworkFlavourTag.FtagRun3DerivationConfig import FtagJetCollections
+from DerivationFrameworkFlavourTag.FtagDerivationConfig import FtagJetCollections
FtagJetCollections(['AntiKt4EMPFlowJets','AntiKtVR30Rmax4Rmin02TrackJets'],DerivationFrameworkJob)
#====================================================================
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSM/python/STDM7.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSM/python/STDM7.py
index 0e517586462d..f2d6e37586b8 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSM/python/STDM7.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSM/python/STDM7.py
@@ -117,7 +117,7 @@ def STDM7Cfg(flags):
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
- STDM7SlimmingHelper = SlimmingHelper("STDM7SlimmingHelper", NamesAndTypes = flags.Input.TypedCollections)
+ STDM7SlimmingHelper = SlimmingHelper("STDM7SlimmingHelper", NamesAndTypes = flags.Input.TypedCollections, ConfigFlags = flags)
STDM7SlimmingHelper.SmartCollections = ["EventInfo",
"Electrons",
"Photons",
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTileCal/python/TCAL1.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTileCal/python/TCAL1.py
index 028d09fe9da0..accd38efff96 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTileCal/python/TCAL1.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTileCal/python/TCAL1.py
@@ -131,7 +131,7 @@ def TCAL1Cfg(ConfigFlags):
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
- TCAL1SlimmingHelper = SlimmingHelper("TCAL1SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections)
+ TCAL1SlimmingHelper = SlimmingHelper("TCAL1SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections, ConfigFlags = ConfigFlags)
TCAL1SlimmingHelper.SmartCollections = ['EventInfo', 'Muons', 'AntiKt4EMTopoJets', 'AntiKt4EMPFlowJets', 'MET_Baseline_AntiKt4EMTopo', 'MET_Baseline_AntiKt4EMPFlow', 'PrimaryVertices']
TCAL1ExtraVariables = f'Muons.{TCAL1Prefix}etrkcone40'
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTileCal/python/TCAL2.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTileCal/python/TCAL2.py
index 3a856dc2435b..b9205a56de6a 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTileCal/python/TCAL2.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTileCal/python/TCAL2.py
@@ -77,7 +77,7 @@ def TCAL2Cfg(ConfigFlags):
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
- TCAL2SlimmingHelper = SlimmingHelper("TCAL2SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections)
+ TCAL2SlimmingHelper = SlimmingHelper("TCAL2SlimmingHelper", NamesAndTypes = ConfigFlags.Input.TypedCollections, ConfigFlags = ConfigFlags)
TCAL2SlimmingHelper.SmartCollections = ["EventInfo"]
if ConfigFlags.GeoModel.Run in [LHCPeriod.Run1, LHCPeriod.Run2, LHCPeriod.Run3]:
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTrigger/share/TRIG.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTrigger/share/TRIG.py
index eac4cc7515e1..67c989bb251d 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTrigger/share/TRIG.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTrigger/share/TRIG.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
#====================================================================
# DAOD_TRIG.py
@@ -245,7 +245,7 @@ SeqTRIG += CfgMgr.DerivationFramework__DerivationKernel("TRIGKernel",
# FLAVOUR TAGGING
#====================================================================
-from DerivationFrameworkFlavourTag.FtagRun3DerivationConfig import FtagJetCollection
+from DerivationFrameworkFlavourTag.FtagDerivationConfig import FtagJetCollection
FtagJetCollection('AntiKt4EMPFlowJets',SeqTRIG)
diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/README.md b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/README.md
index 7097a275db6c..2262c99d0d53 100644
--- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/README.md
+++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/README.md
@@ -29,4 +29,4 @@ This is a rough sketch of how information flows through the b-tagging code. Litt
Many of the functions to configure the above can be found in this
package, with `Cfg` appended to the name. In particular, the main
function here is `BTagAlgsCfg`, which can be found in
-[BTagRun3Config](python/BTagRun3Config.py).
+[BTagConfig](python/BTagConfig.py).
diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagRun3Config.py b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagConfig.py
similarity index 95%
rename from PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagRun3Config.py
rename to PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagConfig.py
index 45f438e45e5a..7318628ffb5b 100644
--- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagRun3Config.py
+++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagConfig.py
@@ -2,7 +2,7 @@
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
-from AthenaConfiguration.Enums import BeamType
+from AthenaConfiguration.Enums import BeamType, LHCPeriod
from BTagging.JetParticleAssociationAlgConfig import JetParticleAssociationAlgCfg
from BTagging.JetBTaggingAlgConfig import JetBTaggingAlgCfg
from BTagging.JetSecVertexingAlgConfig import JetSecVertexingAlgCfg
@@ -19,7 +19,20 @@ from BTagging.BTaggingConfiguration import getConfiguration
from OutputStreamAthenaPool.OutputStreamConfig import addToESD, addToAOD
# this is where you add the new trainings!
-def GetTaggerTrainingMap(jet_collection_list):
+def GetTaggerTrainingMap(inputFlags, jet_collection_list):
+ if inputFlags.GeoModel.Run >= LHCPeriod.Run4:
+ derivationTrainingMap = {
+ "AntiKt4EMTopo": [
+ "BTagging/20221008/dipsrun4/antikt4emtopo/network.json",
+ "BTagging/20221017/dl1drun4/antikt4emtopo/network.json",
+ "BTagging/20221010/GN1run4/antikt4emtopo/network.onnx"
+ ]
+ }
+ if jet_collection_list in derivationTrainingMap.keys():
+ return derivationTrainingMap[jet_collection_list]
+ else: # Default to AntiKt4EMTopo trainings in case nothing else available
+ return derivationTrainingMap["AntiKt4EMTopo"]
+
derivationTrainingMap = {
"AntiKt4EMPFlow": [
"BTagging/201903/rnnip/antikt4empflow/network.json",
@@ -132,7 +145,7 @@ def BTagRecoSplitCfg(inputFlags, JetCollection=['AntiKt4EMTopo','AntiKt4EMPFlow'
BTagAlgsCfg(
inputFlags,
JetCollection=jc,
- nnList=GetTaggerTrainingMap(jc),
+ nnList=GetTaggerTrainingMap(inputFlags, jc),
muons='', # muon augmentation isn't thread safe, disable
renameTrackJets=True,
AddedJetSuffix='Jets'
diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagESD.py b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagESD.py
index 46b800a8b106..4c11e6824739 100644
--- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagESD.py
+++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagESD.py
@@ -166,7 +166,7 @@ if __name__=="__main__":
inputESD = "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecExRecoTest/mc21_13p6TeV/ESDFiles/mc21_13p6TeV.421450.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep_fct.recon.ESD.e8445_e8447_s3822_r13565/ESD.28877240._000046.pool.root.1"
import argparse
- parser = argparse.ArgumentParser(prog="BTagRun3Config: An example configuration module for btagging reconstruction reading an ESD",
+ parser = argparse.ArgumentParser(prog="BTagConfig: An example configuration module for btagging reconstruction reading an ESD",
usage="Call with an input file, pass -n=0 to skip execution, -t 0 for serial or 1 for threaded execution.")
parser.add_argument("-f", "--filesIn", default = inputESD, type=str, help="Comma-separated list of input files")
parser.add_argument("-t", "--nThreads", default=1, type=int, help="The number of concurrent threads to run. 0 uses serial Athena.")
diff --git a/Reconstruction/RecExample/RecExCommon/share/CombinedRec_config.py b/Reconstruction/RecExample/RecExCommon/share/CombinedRec_config.py
index 8fc6f3b99313..6b4ac6a70b41 100755
--- a/Reconstruction/RecExample/RecExCommon/share/CombinedRec_config.py
+++ b/Reconstruction/RecExample/RecExCommon/share/CombinedRec_config.py
@@ -147,7 +147,7 @@ if rec.readESD():
rec.doBTagging=False
if (jetOK or rec.readESD()) and rec.doBTagging() and DetFlags.ID_on() and DetFlags.Muon_on():
# Configure BTagging algorithm
- from BTagging.BTagRun3Config import BTagRecoSplitCfg
+ from BTagging.BTagConfig import BTagRecoSplitCfg
CAtoGlobalWrapper(BTagRecoSplitCfg, ConfigFlags)
#
diff --git a/Reconstruction/RecJobTransforms/python/RecoSteering.py b/Reconstruction/RecJobTransforms/python/RecoSteering.py
index 6d108576cf5c..115058387f0b 100644
--- a/Reconstruction/RecJobTransforms/python/RecoSteering.py
+++ b/Reconstruction/RecJobTransforms/python/RecoSteering.py
@@ -153,7 +153,7 @@ def RecoSteering(flags):
# btagging
acc.flagPerfmonDomain('FTag')
if flags.Reco.EnableBTagging:
- from BTagging.BTagRun3Config import BTagRecoSplitCfg
+ from BTagging.BTagConfig import BTagRecoSplitCfg
acc.merge(BTagRecoSplitCfg(flags))
log.info("---------- Configured btagging")
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Bjet/BjetFlavourTaggingConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Bjet/BjetFlavourTaggingConfiguration.py
index 633a180d9f89..0f80923ee3a7 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Bjet/BjetFlavourTaggingConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Bjet/BjetFlavourTaggingConfiguration.py
@@ -7,7 +7,7 @@ from AthenaConfiguration.AllConfigFlags import ConfigFlags
# standard b-tagging
from BTagging.JetParticleAssociationAlgConfig import JetParticleAssociationAlgCfg
from BTagging.BTagTrackAugmenterAlgConfig import BTagTrackAugmenterAlgCfg
-from BTagging.BTagRun3Config import BTagAlgsCfg
+from BTagging.BTagConfig import BTagAlgsCfg
from JetTagCalibration.JetTagCalibConfig import JetTagCalibCfg
# fast btagging
--
GitLab