TrigL2MuonSA: use CA version to configure TrigL2MuonSA (!60969) · Merge requests · atlas / athena

Frank Winklmeier requested to merge fwinkl/athena:muonsa into master Feb 23, 2023
Use the CA version as the default to configure TrigL2MuonSA. Multiple fixes had to be ported from the legacy version:
RpcClusterPreparator config added
MuCalStreamerTool configuration fixed
RoI-based access for NSW fixed
add support for missing setup values
Calibration stream name set
And some code cleanup:
remove unused roisKey arguments
avoid class aliases when calling getComp
The job configuration is identical apart from:
Minor component name changes
Extrapolators configured explicitly and not added to ToolSvc
Click to expand to see the full job configuration diff
confTool.py --diff ../tmp2/HLTJobOptions.pkl HLTJobOptions.pkl
Step 1: reference file #components: 64280
Step 2: file to check  #components: 64280
Legend:
Differences in components Settings in 1st file Settings in 2nd file
Component ApplicationMgr may differ
        ExtSvc =  ['ToolSvc/ToolSvc', 'AuditorSvc/AuditorSvc', 'TrigConf::JobOptionsSvc/JobOptionsSvc', 'TrigMessageSvc/MessageSvc', 'ClassIDSvc/ClassIDSvc', 'AlgContextSvc/AlgContextSvc', 'StoreGateSvc/StoreGateSvc', 'StoreGateSvc/Detecto
rStore', 'StoreGateSvc/HistoryStore', 'StoreGateSvc/ConditionStore', 'SG::HiveMgrSvc/EventDataSvc', 'AlgResourcePool/AlgResourcePool', 'AvalancheSchedulerSvc/AvalancheSchedulerSvc', 'CoreDumpSvc/CoreDumpSvc', 'IOVSvc/IOVSvc', 'TrigMonTHist
Svc/THistSvc', 'HltROBDataProviderSvc/ROBDataProviderSvc', 'IOVDbSvc/IOVDbSvc', 'PoolSvc/PoolSvc', 'CondSvc/CondSvc', 'ProxyProviderSvc/ProxyProviderSvc', 'DBReplicaSvc/DBReplicaSvc', 'TagInfoMgr/TagInfoMgr', 'StoreGateSvc/MetaDataStore', 
'StoreGateSvc/InputMetaDataStore', 'MetaDataSvc/MetaDataSvc', 'AthenaPoolCnvSvc/AthenaPoolCnvSvc', 'EvtPersistencySvc/EventPersistencySvc', 'TrigByteStreamCnvSvc/ByteStreamCnvSvc', 'TrigByteStreamInputSvc/ByteStreamInputSvc', 'TrigEventSel
ectorByteStream/EventSelectorByteStream', 'ByteStreamAddressProviderSvc/ByteStreamAddressProviderSvc', 'HltEventLoopMgr/HltEventLoopMgr', 'SchedulerMonSvc/SchedulerMonSvc', 'DetDescrCnvSvc/DetDescrCnvSvc', 'GeoModelSvc/GeoModelSvc', 'AGDDt
oGeoSvc/AGDDtoGeoSvc', 'Muon::MuonIdHelperSvc/MuonIdHelperSvc', 'MuonTGC_CablingSvc/MuonTGC_CablingSvc', 'TGCcablingServerSvc/TGCcablingServerSvc', 'Athena::DelayedConditionsCleanerSvc/Athena::DelayedConditionsCleanerSvc', 'Athena::Conditi
onsCleanerSvc/Athena::ConditionsCleanerSvc', 'IncidentSvc/IncidentSvc', 'HistogramSvc/HistogramDataSvc', 'NTupleSvc/NTupleSvc', 'RndmGenSvc/RndmGenSvc', 'ChronoStatSvc/ChronoStatSvc', 'AthDictLoaderSvc/AthDictLoaderSvc', 'PrecedenceSvc/Pre
cedenceSvc', 'GeometryDBSvc/InDetGeometryDBSvc', 'TileInfoLoader/TileInfoLoader', 'TileCablingSvc/TileCablingSvc', 'AmdcsimrecAthenaSvc/AmdcsimrecAthenaSvc', 'InDetDD::PixelReadoutManager/PixelReadoutManager', 'TRT_CablingSvc/TRT_CablingSv
c', 'TrigCostSvc/TrigCostSvc', 'LArFlatConditionSvc/LArFlatConditionSvc', 'TrigCaloDataAccessSvc/TrigCaloDataAccessSvc', 'CSCcablingSvc/CSCcablingSvc', 'DetDescrDBEnvelopeSvc/AtlasGeometry_EnvelopeDefSvc', 'DetDescrDBEnvelopeSvc/AtlasEnvel
opeSvcDefinitionSvc', 'AthRNGSvc/AthRNGSvc', 'Muon::MuonEDMHelperSvc/MuonEDMHelperSvc', 'TrigConf::LVL1ConfigSvc/LVL1ConfigSvc', 'TrigConf::HLTConfigSvc/HLTConfigSvc', 'TRT_HWMappingSvc/InDetTrigInDetTRT_HWMappingSvc', 'TRT_ConditionsSumma
rySvc/InDetTrigInDetTRTConditionsSummaryService', 'CondProxyProvider/CondProxyProvider', 'egammaMVASvc/trigPrecCaloEgammaMVASvc', 'egammaMVASvc/trigPrecEgammaMVASvc', 'egammaMVASvc/egammaMVASvc_LegacyConfig', 'TrigL2MuonSA::PtEndcapLUTSvc/
PtEndcapLUTSvc', 'TrigL2MuonSA::PtEndcapLUTSvc/PtEndcapLUTSvc_MC', 'TrigL2MuonSA::PtBarrelLUTSvc/PtBarrelLUTSvc', 'TrigL2MuonSA::PtBarrelLUTSvc/PtBarrelLUTSvc_MC', 'TrigL2MuonSA::AlignmentBarrelLUTSvc/AlignmentBarrelLUTSvc', 'Trk::Tracking
VolumesSvc/TrackingVolumesSvc', 'ActsTrackingGeometrySvc/ActsTrackingGeometrySvc']  vs  ['ToolSvc/ToolSvc', 'AuditorSvc/AuditorSvc', 'TrigConf::JobOptionsSvc/JobOptionsSvc', 'TrigMessageSvc/MessageSvc', 'ClassIDSvc/ClassIDSvc', 'AlgContext
Svc/AlgContextSvc', 'StoreGateSvc/StoreGateSvc', 'StoreGateSvc/DetectorStore', 'StoreGateSvc/HistoryStore', 'StoreGateSvc/ConditionStore', 'SG::HiveMgrSvc/EventDataSvc', 'AlgResourcePool/AlgResourcePool', 'AvalancheSchedulerSvc/AvalancheSc
hedulerSvc', 'CoreDumpSvc/CoreDumpSvc', 'IOVSvc/IOVSvc', 'TrigMonTHistSvc/THistSvc', 'HltROBDataProviderSvc/ROBDataProviderSvc', 'IOVDbSvc/IOVDbSvc', 'PoolSvc/PoolSvc', 'CondSvc/CondSvc', 'ProxyProviderSvc/ProxyProviderSvc', 'DBReplicaSvc/
DBReplicaSvc', 'TagInfoMgr/TagInfoMgr', 'StoreGateSvc/MetaDataStore', 'StoreGateSvc/InputMetaDataStore', 'MetaDataSvc/MetaDataSvc', 'AthenaPoolCnvSvc/AthenaPoolCnvSvc', 'EvtPersistencySvc/EventPersistencySvc', 'TrigByteStreamCnvSvc/ByteStr
eamCnvSvc', 'TrigByteStreamInputSvc/ByteStreamInputSvc', 'TrigEventSelectorByteStream/EventSelectorByteStream', 'ByteStreamAddressProviderSvc/ByteStreamAddressProviderSvc', 'HltEventLoopMgr/HltEventLoopMgr', 'SchedulerMonSvc/SchedulerMonSv
c', 'DetDescrCnvSvc/DetDescrCnvSvc', 'GeoModelSvc/GeoModelSvc', 'AGDDtoGeoSvc/AGDDtoGeoSvc', 'Muon::MuonIdHelperSvc/MuonIdHelperSvc', 'MuonTGC_CablingSvc/MuonTGC_CablingSvc', 'TGCcablingServerSvc/TGCcablingServerSvc', 'Athena::DelayedCondi
tionsCleanerSvc/Athena::DelayedConditionsCleanerSvc', 'Athena::ConditionsCleanerSvc/Athena::ConditionsCleanerSvc', 'IncidentSvc/IncidentSvc', 'HistogramSvc/HistogramDataSvc', 'NTupleSvc/NTupleSvc', 'RndmGenSvc/RndmGenSvc', 'ChronoStatSvc/C
hronoStatSvc', 'AthDictLoaderSvc/AthDictLoaderSvc', 'PrecedenceSvc/PrecedenceSvc', 'GeometryDBSvc/InDetGeometryDBSvc', 'TileInfoLoader/TileInfoLoader', 'TileCablingSvc/TileCablingSvc', 'AmdcsimrecAthenaSvc/AmdcsimrecAthenaSvc', 'InDetDD::P
ixelReadoutManager/PixelReadoutManager', 'TRT_CablingSvc/TRT_CablingSvc', 'TrigCostSvc/TrigCostSvc', 'LArFlatConditionSvc/LArFlatConditionSvc', 'TrigCaloDataAccessSvc/TrigCaloDataAccessSvc', 'CSCcablingSvc/CSCcablingSvc', 'DetDescrDBEnvelo
peSvc/AtlasGeometry_EnvelopeDefSvc', 'DetDescrDBEnvelopeSvc/AtlasEnvelopeSvcDefinitionSvc', 'AthRNGSvc/AthRNGSvc', 'Muon::MuonEDMHelperSvc/MuonEDMHelperSvc', 'TrigConf::LVL1ConfigSvc/LVL1ConfigSvc', 'TrigConf::HLTConfigSvc/HLTConfigSvc', '
TRT_HWMappingSvc/InDetTrigInDetTRT_HWMappingSvc', 'TRT_ConditionsSummarySvc/InDetTrigInDetTRTConditionsSummaryService', 'CondProxyProvider/CondProxyProvider', 'egammaMVASvc/trigPrecCaloEgammaMVASvc', 'egammaMVASvc/trigPrecEgammaMVASvc', 'e
gammaMVASvc/egammaMVASvc_LegacyConfig', 'TrigL2MuonSA::PtBarrelLUTSvc/PtBarrelLUTSvc', 'TrigL2MuonSA::PtBarrelLUTSvc/PtBarrelLUTSvc_MC', 'TrigL2MuonSA::PtEndcapLUTSvc/PtEndcapLUTSvc', 'TrigL2MuonSA::PtEndcapLUTSvc/PtEndcapLUTSvc_MC', 'Trig
L2MuonSA::AlignmentBarrelLUTSvc/AlignmentBarrelLUTSvc', 'Trk::TrackingVolumesSvc/TrackingVolumesSvc', 'ActsTrackingGeometrySvc/ActsTrackingGeometrySvc']   <<
                >>  :  ^^ Different order ^^ 
   1 relevant differences
Component MuFastSteering_Muon may differ
        InsideOutMode = False  only in 1st file 
        MonTool =  GenericMonitoringTool/Muon  vs  GenericMonitoringTool/TrigL2MuonSAMonitoring   <<
        RecMuonRoI =  LVL1MuonRoIs  vs  StoreGateSvc+LVL1MuonRoIs   <<
        Run2RecMuonRoI =  HLT_RecMURoIs  vs  StoreGateSvc+HLT_RecMURoIs   <<
   1 relevant differences

 Component MuFastSteering_Muon.Muon only in 1st file  

Component MuFastSteering_Muon.TrigL2MuonSA::FtfRoadDefiner.AtlasExtrapolator may differ
        MaterialEffectsUpdators =  []  vs  ['Trk::MaterialEffectsUpdator/AtlasMaterialEffectsUpdator', 'Trk::MaterialEffectsUpdator/AtlasMaterialEffectsUpdatorLandau']   <<
        Propagators =  []  vs  ['Trk::RungeKuttaPropagator/AtlasRungeKuttaPropagator', 'Trk::STEP_Propagator/AtlasSTEP_Propagator']   <<
        SubMEUpdators =  []  vs  ['AtlasMaterialEffectsUpdator', 'AtlasMaterialEffectsUpdator', 'AtlasMaterialEffectsUpdator', 'AtlasMaterialEffectsUpdator', 'AtlasMaterialEffectsUpdator', 'AtlasMaterialEffectsUpdator']   <<
        SubPropagators =  []  vs  ['AtlasRungeKuttaPropagator', 'AtlasRungeKuttaPropagator', 'AtlasSTEP_Propagator', 'AtlasSTEP_Propagator', 'AtlasSTEP_Propagator', 'AtlasRungeKuttaPropagator']   <<
   but all are suppressed by renaming/known differences/...

 Component  MuFastSteering_Muon.TrigL2MuonSA::FtfRoadDefiner.AtlasExtrapolator.AtlasMaterialEffectsUpdator  only in 2nd file  


 Component  MuFastSteering_Muon.TrigL2MuonSA::FtfRoadDefiner.AtlasExtrapolator.AtlasMaterialEffectsUpdatorLandau  only in 2nd file  


 Component  MuFastSteering_Muon.TrigL2MuonSA::FtfRoadDefiner.AtlasExtrapolator.AtlasRungeKuttaPropagator  only in 2nd file  

Component MuFastSteering_Muon.TrigL2MuonSA::MuFastDataPreparator may differ
        CSCDataPreparator =  TrigL2MuonSA::CscDataPreparator/TrigL2MuonSA::CscDataPreparator  vs     <<
   but all are suppressed by renaming/known differences/...

 Component MuFastSteering_Muon.TrigL2MuonSA::MuFastDataPreparator.TrigL2MuonSA::CscDataPreparator only in 1st file  


 Component  MuFastSteering_Muon.TrigL2MuonSAMonitoring  only in 2nd file  

Component MuFastSteering_MuonIOmode may differ
        MonTool =  GenericMonitoringTool/MuonIOmode  vs  GenericMonitoringTool/TrigL2MuonSAMonitoring   <<
        RecMuonRoI =  LVL1MuonRoIs  vs  StoreGateSvc+LVL1MuonRoIs   <<
        Run2RecMuonRoI =  HLT_RecMURoIs  vs  StoreGateSvc+HLT_RecMURoIs   <<
   but all are suppressed by renaming/known differences/...

 Component MuFastSteering_MuonIOmode.MuonIOmode only in 1st file  

Component MuFastSteering_MuonIOmode.TrigL2MuonSA::FtfRoadDefiner.AtlasExtrapolator may differ
        MaterialEffectsUpdators =  []  vs  ['Trk::MaterialEffectsUpdator/AtlasMaterialEffectsUpdator', 'Trk::MaterialEffectsUpdator/AtlasMaterialEffectsUpdatorLandau']   <<
        Propagators =  []  vs  ['Trk::RungeKuttaPropagator/AtlasRungeKuttaPropagator', 'Trk::STEP_Propagator/AtlasSTEP_Propagator']   <<
        SubMEUpdators =  []  vs  ['AtlasMaterialEffectsUpdator', 'AtlasMaterialEffectsUpdator', 'AtlasMaterialEffectsUpdator', 'AtlasMaterialEffectsUpdator', 'AtlasMaterialEffectsUpdator', 'AtlasMaterialEffectsUpdator']   <<
        SubPropagators =  []  vs  ['AtlasRungeKuttaPropagator', 'AtlasRungeKuttaPropagator', 'AtlasSTEP_Propagator', 'AtlasSTEP_Propagator', 'AtlasSTEP_Propagator', 'AtlasRungeKuttaPropagator']   <<
   but all are suppressed by renaming/known differences/...

 Component  MuFastSteering_MuonIOmode.TrigL2MuonSA::FtfRoadDefiner.AtlasExtrapolator.AtlasMaterialEffectsUpdator  only in 2nd file  


 Component  MuFastSteering_MuonIOmode.TrigL2MuonSA::FtfRoadDefiner.AtlasExtrapolator.AtlasMaterialEffectsUpdatorLandau  only in 2nd file  


 Component  MuFastSteering_MuonIOmode.TrigL2MuonSA::FtfRoadDefiner.AtlasExtrapolator.AtlasRungeKuttaPropagator  only in 2nd file  

Component MuFastSteering_MuonIOmode.TrigL2MuonSA::MuFastDataPreparator may differ
        CSCDataPreparator =  TrigL2MuonSA::CscDataPreparator/TrigL2MuonSA::CscDataPreparator  vs     <<
   but all are suppressed by renaming/known differences/...

 Component MuFastSteering_MuonIOmode.TrigL2MuonSA::MuFastDataPreparator.TrigL2MuonSA::CscDataPreparator only in 1st file  


 Component  MuFastSteering_MuonIOmode.TrigL2MuonSAMonitoring  only in 2nd file  

Component MuFastSteering_Muonl2mtmode may differ
        InsideOutMode = False  only in 1st file 
        MonTool =  GenericMonitoringTool/Muonl2mtmode  vs  GenericMonitoringTool/TrigL2MuonSAMonitoring   <<
        RecMuonRoI =  LVL1MuonRoIs  vs  StoreGateSvc+LVL1MuonRoIs   <<
        Run2RecMuonRoI =  HLT_RecMURoIs  vs  StoreGateSvc+HLT_RecMURoIs   <<
   1 relevant differences

 Component MuFastSteering_Muonl2mtmode.Muonl2mtmode only in 1st file  

Component MuFastSteering_Muonl2mtmode.TrigL2MuonSA::FtfRoadDefiner.AtlasExtrapolator may differ
        MaterialEffectsUpdators =  []  vs  ['Trk::MaterialEffectsUpdator/AtlasMaterialEffectsUpdator', 'Trk::MaterialEffectsUpdator/AtlasMaterialEffectsUpdatorLandau']   <<
        Propagators =  []  vs  ['Trk::RungeKuttaPropagator/AtlasRungeKuttaPropagator', 'Trk::STEP_Propagator/AtlasSTEP_Propagator']   <<
        SubMEUpdators =  []  vs  ['AtlasMaterialEffectsUpdator', 'AtlasMaterialEffectsUpdator', 'AtlasMaterialEffectsUpdator', 'AtlasMaterialEffectsUpdator', 'AtlasMaterialEffectsUpdator', 'AtlasMaterialEffectsUpdator']   <<
        SubPropagators =  []  vs  ['AtlasRungeKuttaPropagator', 'AtlasRungeKuttaPropagator', 'AtlasSTEP_Propagator', 'AtlasSTEP_Propagator', 'AtlasSTEP_Propagator', 'AtlasRungeKuttaPropagator']   <<
   but all are suppressed by renaming/known differences/...

 Component  MuFastSteering_Muonl2mtmode.TrigL2MuonSA::FtfRoadDefiner.AtlasExtrapolator.AtlasMaterialEffectsUpdator  only in 2nd file  


 Component  MuFastSteering_Muonl2mtmode.TrigL2MuonSA::FtfRoadDefiner.AtlasExtrapolator.AtlasMaterialEffectsUpdatorLandau  only in 2nd file  


 Component  MuFastSteering_Muonl2mtmode.TrigL2MuonSA::FtfRoadDefiner.AtlasExtrapolator.AtlasRungeKuttaPropagator  only in 2nd file  

Component MuFastSteering_Muonl2mtmode.TrigL2MuonSA::MuFastDataPreparator may differ
        CSCDataPreparator =  TrigL2MuonSA::CscDataPreparator/TrigL2MuonSA::CscDataPreparator  vs     <<
   but all are suppressed by renaming/known differences/...

 Component MuFastSteering_Muonl2mtmode.TrigL2MuonSA::MuFastDataPreparator.TrigL2MuonSA::CscDataPreparator only in 1st file  


 Component  MuFastSteering_Muonl2mtmode.TrigL2MuonSAMonitoring  only in 2nd file  


 Component ToolSvc.AlignedBackExtrapolator only in 1st file  


 Component ToolSvc.DataBackExtrapolator only in 1st file  


 Component ToolSvc.MisalignedBackExtrapolator only in 1st file  


 Component ToolSvc.TrigL2MuonSA::CscRegDict only in 1st file  


 Component ToolSvc.TrigL2MuonSA::CscSegmentMaker only in 1st file  


 Component ToolSvc.TrigL2MuonSA::CscSegmentMaker.TrigL2MuonSA::CscRegDict only in 1st file
Relates to ATR-25083. cc @yoyamagu @sshaw
In a separate MR will then rename the _newJO.py file (doing it in the same MR confuses the diff too much).
Edited Feb 23, 2023 by Frank Winklmeier
TrigL2MuonSA: use CA version to configure TrigL2MuonSA

Merge request reports
