Avoid use of naughtyRetrieve in SCT_RodDecoder
- Avoid use of naughtyRetrieve in SCT_RodDecoder
- Prepare a collection, fill the collection and add the collection to the container
- Use IDC_WriteHandle and addOrDelete instead
- Use SCT_RDO_Container instead of ISCT_RDO_Container
- Update SCT_RodDecoder::SharedData
- Add
std::unordered_map<IdentifierHash, std::unique_ptr<SCT_RDO_Collection>> rdoCollMapand `std::unordered_map<IdentifierHash, SCT_RDO_Container::IDC_WriteHandle> writeHandleMap' to keep SCT_RDO_Collection and IDC_WriteHandle. - Add setCollection method to centralize manipulations related to linkIDHash (=waferHash).
- Add
- Remove SCT_RodDecoderErrorsHelper& errorsCache from SCT_RodDecoder::makeRDO because it is now manipulated in SCT_RodDecoder::SharedData::setCollection
RunTier0Tests.py found some differences in HLT results. SCT deadsensors of four HLT tracks were unexpectedly reduced from 1 to 0. RNN score and its significance of an HLT tau jet was sligtly changed. RunTier0Tests.log diff-root-q221.ESD.log This is caused by SCT_FlaggedConditionTool. https://its.cern.ch/jira/browse/ATLASRECTS-5624 was created for this.
Tag @abarton
Merge request reports
Activity
added InnerDetector master review-pending-level-1 labels
removed review-pending-level-1 label
Athena AthSimulation AthGeneration AnalysisBase externals 
cmake make required tests 
optional tests Full details available on this CI monitor view
added review-pending-level-1 label
added 1 commit
- 841c5f5a - Remove if (rdoIDCont.hasExternalCache() and rdoIDCont.tryAddFromCache(data.linkIDHash))
-
Athena AthSimulation AthGeneration AnalysisBase externals cmake make required tests optional tests Full details available on this CI monitor view
-
Athena AthSimulation AthGeneration AnalysisBase externals cmake make required tests optional tests Full details available on this CI monitor view
Removal of
if (rdoIDCont.hasExternalCache() and rdoIDCont.tryAddFromCache(data.linkIDHash))looks fine.I will check the failure of the CI test of HLT MC.
- https://gitlab.cern.ch/atlas-sit/CI/-/blob/master/TestConfig/Trigger_athena_MC.citest
- https://acode-browser1.usatlas.bnl.gov/lxr/source/athena/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoRDOTrig_mt1_build.py
asetup Athena master latest test_trigAna_RDOtoRDOTrig_mt1_build.pyreproduced the differences.
--- /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-08-18T2101/Athena/22.0.18/InstallArea/x86_64-centos7-gcc8-opt/data/TrigAnalysisTest/ref_RDOtoRDOTrig_mt1_build.ref 2020-08-18 21:02:39.000000000 +0200 +++ ref_RDOtoRDOTrig_mt1_build.ref.new 2020-08-20 04:40:53.000000001 +0200 @@ -267,6 +267,6 @@ TrigSignatureMoniMT INFO -- #3341539267 Features 0 0 0 0 0 0 0 0 0 0 50 - TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_bmv2c1070_split_L1J20 #991419339 -TrigSignatureMoniMT INFO -- #991419339 Events 19 19 0 0 0 0 0 0 0 0 0 0 19 11 11 -TrigSignatureMoniMT INFO -- #991419339 Features 0 0 0 0 0 0 0 0 0 0 49 21 +TrigSignatureMoniMT INFO -- #991419339 Events 19 19 0 0 0 0 0 0 0 0 0 0 19 10 10 +TrigSignatureMoniMT INFO -- #991419339 Features 0 0 0 0 0 0 0 0 0 0 49 20 TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_boffperf_split_L1J20 #1961149049 TrigSignatureMoniMT INFO -- #1961149049 Events 19 19 0 0 0 0 0 0 0 0 0 0 19 19 19 === Alert! FAILURE input file (+) differs from reference (-)Edited by Susumu Odaremoved review-pending-level-1 label
-
The differences of the q221 test
006.xAOD::TrackParticleAuxContainer_v5_HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bjet_IDTrigAux.numberOfSCTDeadSensors.16 '\x01' -> '\x00' => diff= [N/A] 006.xAOD::TrackParticleAuxContainer_v5_HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_IDTrigAux.numberOfSCTDeadSensors.23 '\x01' -> '\x00' => diff= [N/A] 006.xAOD::TrackParticleAuxContainer_v5_HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Tau_IDTrigAux.numberOfSCTDeadSensors.14 '\x01' -> '\x00' => diff= [N/A] 006.xAOD::TrackParticleAuxContainer_v5_HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Tau_IDTrigAux.numberOfSCTDeadSensors.67 '\x01' -> '\x00' => diff= [N/A]0072 return m_sctCondSummaryTool->isGood(element.identifyHash());SCT_FlaggedConditionTool::isGood reports false without this MR and reports true with this MR for a wafer for one event. SCT_FlaggedConditionTool uses transient objects of SCT_FlaggedCondData created by SCT_Clusterization. SCT_FlaggedCondData is now
typedef std::map<IdentifierHash, std::string> SCT_FlaggedCondData;. Probably, we need to change it to IDCInDetBSErrContainer. I will make a JIRA ticket.I expect the differences seen in HLT MC CI test are also due to SCT_FlaggedCondData. But I don't know which is "correct" for now.
I think it is OK to accept this MR.
Edited by Susumu Oda added review-pending-level-1 label
added changes-trigger-counts label
MC trigger failures should be resolved by !35766 (merged).
removed changes-trigger-counts label
-
Athena AthSimulation AthGeneration AnalysisBase externals cmake make required tests optional tests Full details available on this CI monitor view
added review-approved label and removed review-pending-level-1 label
mentioned in commit 82e7e38c
added sweep:ignore label
