Skip to content

TrigConfL1Data, etc: MT-safety fixes

Scott Snyder requested to merge ssnyder/athena:thread.TrigConfL1Data-20191108 into master

Adjust this package so that it passes the thread-safety checker.

  • Change static members of CTPFiles to ordinary members.
  • Make the static data in L1DataDef const. This class was holding static data that changed based on whether the L1 version was 0 or 1. Instead, include both versions in a const static table, and pass the L1 version through the interfaces used to access the data. Looks like we can also remove the set[Old,New]JEP3Cabling calls at this point. Only the New one actually gets called, and that's redundant with other settings.
  • In TriggerThresholdValue, Instead of holding a const CaloInfo object, just copy the four fields of interest into atomic fields.
  • Const fixes in TriggerItem, ThresholdConfig, TriggerItemNode.

Update additional packages for interface changes here: TrigConfStorage, TrigConfigSvc, TrigT1CaloMonitoringTools, TrigT1CaloSim, TrigT1Interfaces, TrigT1Monitoring

Merge request reports