From 58ce6a4fae86233cc70e87a6563c0b29e080e4f5 Mon Sep 17 00:00:00 2001
From: Soshi Tsuno <soshi.tsuno@cern.ch>
Date: Fri, 28 Aug 2020 04:18:38 +0200
Subject: [PATCH] update
---
.../PixelConditionsTools/src/PixelConditionsSummaryTool.h | 2 +-
.../PixelRawDataByteStreamCnv/src/PixelRawDataProvider.h | 2 +-
.../python/InDetTrigPrepRawDataFormatMonitoring.py | 2 +-
.../src/Pixel_TrgClusterization.cxx | 2 +-
.../InDetTrigRawDataProvider/src/TrigPixRawDataProvider.cxx | 2 +-
Tools/PROCTools/data/master_q431_AOD_digest.ref | 4 ++--
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelConditionsSummaryTool.h b/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelConditionsSummaryTool.h
index e643bd66c2f7..cd02679876eb 100644
--- a/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelConditionsSummaryTool.h
+++ b/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelConditionsSummaryTool.h
@@ -98,7 +98,7 @@ class PixelConditionsSummaryTool: public AthAlgTool, public IInDetConditionsTool
{this, "PixelCablingSvc", "PixelCablingSvc", "Pixel cabling service"};
SG::ReadHandleKey<IDCInDetBSErrContainer> m_BSErrContReadKey
- {this, "PixelByteStreamErrs", "PixBSErr", "PixelByteStreamErrs container key"};
+ {this, "PixelByteStreamErrs", "PixelByteStreamErrs", "PixelByteStreamErrs container key"};
const uint64_t m_missingErrorInfo{std::numeric_limits<uint64_t>::max()-3000000000};
diff --git a/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRawDataProvider.h b/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRawDataProvider.h
index 888a96778f02..b9f4c5605c38 100644
--- a/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRawDataProvider.h
+++ b/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRawDataProvider.h
@@ -56,7 +56,7 @@ private:
SG::ReadHandleKey<TrigRoiDescriptorCollection> m_roiCollectionKey { this, "RoIs", "", "If RoI driven unpacking to be used, this is the key"};
SG::WriteHandleKey<PixelRDO_Container> m_rdoContainerKey { this, "RDOKey", "PixelRDOs"};
SG::UpdateHandleKey<PixelRDO_Cache> m_rdoCacheKey;
- SG::WriteHandleKey<IDCInDetBSErrContainer> m_bsErrorsKey { this, "BSErrorsKey", "PixBSErr"};
+ SG::WriteHandleKey<IDCInDetBSErrContainer> m_bsErrorsKey { this, "BSErrorsKey", "PixelByteStreamErrs"};
SG::UpdateHandleKey<IDCInDetBSErrContainer_Cache> m_bsErrorsCacheKey;
SG::ReadCondHandleKey<PixelCablingCondData> m_condCablingKey { this, "PixelCablingCondData", "PixelCablingCondData", "Pixel cabling key"};
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/python/InDetTrigPrepRawDataFormatMonitoring.py b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/python/InDetTrigPrepRawDataFormatMonitoring.py
index 642d4e7a9f75..0c14e8a6547f 100755
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/python/InDetTrigPrepRawDataFormatMonitoring.py
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/python/InDetTrigPrepRawDataFormatMonitoring.py
@@ -81,7 +81,7 @@ class PixelTrigPrepRawDataFormatMonitorBase(TrigGenericMonitoringToolConfig):
title="Number Det Elements in ROI",
xbins = 100, xmin=0., xmax=maxid)]
- self.Histograms += [ defineHistogram('PixBSErr',
+ self.Histograms += [ defineHistogram('PixelByteStreamErrs',
type='TH1F',
title="Pix BS decoding errors",
xbins = 10, xmin=0., xmax=20,
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/Pixel_TrgClusterization.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/Pixel_TrgClusterization.cxx
index 329eba3de6a2..f3ff3c4f81df 100755
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/Pixel_TrgClusterization.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/Pixel_TrgClusterization.cxx
@@ -83,7 +83,7 @@ namespace InDet{
declareMonitoredVariable("numPixClusters", m_numPixClusters );
declareMonitoredVariable("numPixIds", m_numPixIds );
declareMonitoredStdContainer("PixHashId", m_ClusHashId);
- declareMonitoredStdContainer("PixBSErr", m_PixBSErr);
+ declareMonitoredStdContainer("PixelByteStreamErrs", m_PixBSErr);
m_clusterCollection = NULL;
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/TrigPixRawDataProvider.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/TrigPixRawDataProvider.cxx
index b24f63489f7f..313b6bd8f45d 100644
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/TrigPixRawDataProvider.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/TrigPixRawDataProvider.cxx
@@ -36,7 +36,7 @@ namespace InDet {
declareInterface<InDet::ITrigRawDataProviderTool>(this);
declareProperty("RDOKey", m_RDO_Key = "PixelRDOs_EFID");
declareProperty("RawDataProviderTool", m_rawDataTool);
- declareProperty("DecodingErrorsKey", m_decodingErrorsKey="PixBSErr");
+ declareProperty("DecodingErrorsKey", m_decodingErrorsKey="PixelByteStreamErrs");
}
TrigPixRawDataProvider::~TrigPixRawDataProvider(){
diff --git a/Tools/PROCTools/data/master_q431_AOD_digest.ref b/Tools/PROCTools/data/master_q431_AOD_digest.ref
index 9b416169368c..742e6da7b643 100644
--- a/Tools/PROCTools/data/master_q431_AOD_digest.ref
+++ b/Tools/PROCTools/data/master_q431_AOD_digest.ref
@@ -13,8 +13,8 @@
330470 1183743040 285 307 5 0
330470 1183746343 492 467 12 0
330470 1183746710 6 0 0 0
- 330470 1183751782 239 235 5 0
- 330470 1183752624 347 345 8 3
+ 330470 1183751782 239 235 4 0
+ 330470 1183752624 347 345 8 2
330470 1183753006 357 377 11 3
330470 1183754806 470 405 14 0
330470 1183769295 342 318 8 2
--
GitLab