From c0f62c41cb58a3807a6c45c585d2ac57d5dec466 Mon Sep 17 00:00:00 2001 From: Tomasz Bold <tomasz.bold@gmail.com> Date: Wed, 17 Apr 2019 14:25:13 +0200 Subject: [PATCH] modified PixelRodDecoder not to optimise for cache presence --- .../src/PixelRawDataProvider.cxx | 2 -- .../PixelRawDataByteStreamCnv/src/PixelRodDecoder.cxx | 4 ++-- .../TrigValidation/TrigUpgradeTest/share/full_menu.py | 11 ----------- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRawDataProvider.cxx b/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRawDataProvider.cxx index 0847a601c31..aca728fac40 100644 --- a/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRawDataProvider.cxx +++ b/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRawDataProvider.cxx @@ -137,7 +137,6 @@ StatusCode PixelRawDataProvider::execute() { superRoI.setComposite(true); superRoI.manageConstituents(false); for (; roi!=roiE; ++roi) { - ATH_MSG_DEBUG("Adding RoI "<< **roi); superRoI.push_back(*roi); } m_regionSelector->DetROBIDListUint( PIXEL, @@ -158,7 +157,6 @@ StatusCode PixelRawDataProvider::execute() { IPixelRDO_Container *containerInterface = tempcont ? static_cast< IPixelRDO_Container* >(tempcont.get()) : static_cast< IPixelRDO_Container* >(rdoContainer.ptr()); - ATH_MSG_DEBUG( "Container interface ptr: " << containerInterface ); // ask PixelRawDataProviderTool to decode it and to fill the IDC if (m_rawDataTool->convert(listOfRobf, containerInterface).isFailure()) ATH_MSG_ERROR("BS conversion into RDOs failed"); diff --git a/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRodDecoder.cxx b/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRodDecoder.cxx index 54c95b4d8d5..3890f4b9430 100644 --- a/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRodDecoder.cxx +++ b/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRodDecoder.cxx @@ -648,12 +648,12 @@ StatusCode PixelRodDecoder::fillCollection( const ROBFragment *robFrag, IPixelRD continue; } } - + /* TODO, bring it back when IDC friendly if(rdoIdc->hasExternalCache() && rdoIdc->tryFetch(offlineIdHash)){ ATH_MSG_DEBUG("Hash already in collection - cache hit " << offlineIdHash); continue; } - + */ ATH_CHECK(rdoIdc->naughtyRetrieve(offlineIdHash, coll));//Returns null if not present if(coll==nullptr){ diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu.py b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu.py index 0337fd64990..97e5eb76e66 100644 --- a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu.py +++ b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu.py @@ -227,14 +227,3 @@ import DecisionHandling for a in AthSequencer("HLTAllSteps").getChildren(): if isinstance(a, DecisionHandling.DecisionHandlingConf.TriggerSummaryAlg): a.OutputLevel = DEBUG - - -AthSequencer("AthAlgSeq").InDetCacheCreatorTrig.OutputLevel = DEBUG - - - -def d(alg): - alg.OutputLevel = DEBUG - alg.ProviderTool.OutputLevel = DEBUG -d(AthSequencer("electronInViewAlgs").InDetPixelRawDataProvider) -d(AthSequencer("efcbViewNode_FS").InDetPixelRawDataProvider_MuonFS) -- GitLab