update

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};
 

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"};
 

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,

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;
     

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(){

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