From dc78f06eae09ea6f152e3d735b60236fc0f67c45 Mon Sep 17 00:00:00 2001
From: Fabian Sohns <fabian.sohns@phys.uni-goettingen.de>
Date: Fri, 11 May 2018 16:49:05 +0200
Subject: [PATCH] A more developed version of the config based on the master
 branch, I added 2 new algorithms for column/row_width and
 DisabledAndSynch_Errors as well as consistency checks. All histograms should
 be in the correct place

Former-commit-id: a52c89e55537dbd7136fd86e924ef7e85acc6650
---
 .../config/Pixel/collisions_run.config        | 1641 +++++++++++------
 .../python/TestDisplay.py                     |    2 +-
 2 files changed, 1129 insertions(+), 514 deletions(-)

diff --git a/DataQuality/DataQualityConfigurations/config/Pixel/collisions_run.config b/DataQuality/DataQualityConfigurations/config/Pixel/collisions_run.config
index 4ffee5df4ee..28893d4f396 100644
--- a/DataQuality/DataQualityConfigurations/config/Pixel/collisions_run.config
+++ b/DataQuality/DataQualityConfigurations/config/Pixel/collisions_run.config
@@ -322,63 +322,68 @@ output top_level {
 dir Pixel {
 
   dir Hits {
-    hist num_hits {
-      algorithm = Pix_GatherData
-      output = InnerDetector/Pixel/PixelExpert/GeneralAllHits
-      display = StatBox
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#General_Hits
-    }
-
-    hist Occupancy_Summary_IBL2D {
-      algorithm = Plain_GatherData#Pix_Occupancy_B0B1
+    hist Occupancy_IBL2D {
+      algorithm = Pix_Occupancy_B0B1
       output = InnerDetector/Pixel/PIXIBL/_Experts/HitsLB
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
     hist Occupancy_IBL3D {
-      algorithm = Plain_GatherData#Pix_Occupancy_B0B1
+      algorithm = Pix_Occupancy_B0B1
       output = InnerDetector/Pixel/PIXIBL/_Experts/HitsLB
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
 
-    hist Occupancy__IBL {
-      algorithm = Pix_Occupancy_B0B1
-      output = InnerDetector/Pixel/PIXIBL/Hits
-      display = StatBox
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
-    }
     hist Occupancy_Summary_B0 {
-      algorithm = Plain_GatherData#Pix_Occupancy_B0B1
+      algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIX0/_Experts/Hits
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
     hist Occupancy_Summary_B1 {
-      algorithm = Plain_GatherData#Pix_Occupancy_B0B1
+      algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIX1/_Experts/Hits
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
     hist Occupancy_Summary_B2 {
-      algorithm = Plain_GatherData#Pix_Occupancy_B2
+      algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIX2/_Experts/Hits
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
     hist Occupancy_Summary_ECA {
-      algorithm = Plain_GatherData#Pix_Occupancy_Endcap
+      algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIXECA/_Experts/Hits
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
     hist Occupancy_Summary_ECC {
-      algorithm = Plain_GatherData#Pix_Occupancy_Endcap
+      algorithm = Pix_GatherData
       output = InnerDetector/Pixel/PIXECC/_Experts/Hits
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
+    hist num_hits {
+      algorithm = Pix_GatherData
+      output = InnerDetector/Pixel/PixelExpert/GeneralAllHits
+      display = StatBox
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#General_Hits
+    }
 
+    hist Occupancy_IBL2D {
+      algorithm = Pix_Occupancy_B0B1
+      output = InnerDetector/Pixel/PIXIBL/_Experts/HitsLB
+      display = StatBox
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
+    }
+    hist Occupancy_IBL3D {
+      algorithm = Pix_Occupancy_B0B1
+      output = InnerDetector/Pixel/PIXIBL/_Experts/HitsLB
+      display = StatBox
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
+    }
 
     #hist Average_Occupancy_IBL2D {
     #  algorithm = Pix_Occupancy_B0B1
@@ -498,32 +503,32 @@ dir Pixel {
     }
 
     hist AvgOcc_per_BCID_B0 {
-      algorithm = Plain_GatherData# Pix_LB_Bins_Diff_FromAvg
+      algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIX0/_Experts/HitsLB
       display = StatBox
     }
     hist AvgOcc_per_BCID_B1 {
-      algorithm = Plain_GatherData# Pix_LB_Bins_Diff_FromAvg
+      algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIX1/_Experts/HitsLB
       display = StatBox
     }
     hist AvgOcc_per_BCID_B2 {
-      algorithm = Plain_GatherData#Pix_LB_Bins_Diff_FromAvg
+      algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIX2/_Experts/HitsLB
       display = StatBox
     }
     hist AvgOcc_per_BCID_ECA {
-      algorithm = Plain_GatherData#Pix_LB_Bins_Diff_FromAvg
+      algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIXECA/_Experts/HitsLB
       display = StatBox
     }
     hist AvgOcc_per_BCID_ECC {
-      algorithm = Plain_GatherData#Pix_LB_Bins_Diff_FromAvg
+      algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIXECC/_Experts/HitsLB
       display = StatBox
     }
     hist AvgOcc_per_BCID_IBL {
-      algorithm = Plain_GatherData#Pix_LB_Bins_Diff_FromAvg
+      algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIXIBL/_Experts/HitsLB
       display = StatBox
     }
@@ -537,37 +542,37 @@ dir Pixel {
     }
 
     hist Hits_per_lumi_ECA {
-      algorithm = Plain_GatherData#Pix_LB_Bins_Diff_FromAvg
+      algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIXECA/_Experts/HitsLB
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
     hist Hits_per_lumi_ECC {
-      algorithm = Plain_GatherData#Pix_LB_Bins_Diff_FromAvg
+      algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIXECC/_Experts/HitsLB
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
     hist Hits_per_lumi_IBL {
-      algorithm = Plain_GatherData#Pix_LB_Bins_Diff_FromAvg
+      algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIXIBL/_Experts/HitsLB
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
     hist Hits_per_lumi_B0 {
-      algorithm = Plain_GatherData#Pix_LB_Bins_Diff_FromAvg
+      algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIX0/_Experts/HitsLB
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
     hist Hits_per_lumi_B1 {
-      algorithm = Plain_GatherData#Pix_LB_Bins_Diff_FromAvg
+      algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIX1/_Experts/HitsLB
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
     hist Hits_per_lumi_B2 {
-      algorithm = Plain_GatherData# Pix_LB_Bins_Diff_FromAvg
+      algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIX2/_Experts/HitsLB
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
@@ -678,7 +683,7 @@ dir Pixel {
     }
 
     hist AvgOcc_RatioIBLB0_per_lumi {
-      algorithm = Plain_GatherData#Pix_LB_Bins_Diff_FromAvg
+      algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIXIBL/_Experts/HitsLB
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
@@ -852,7 +857,7 @@ dir Pixel {
     }
     hist Clus_LVL1A_SizeCut_B2 {
       algorithm = Pix_GatherData
-      output = InnerDetector/Pixel/PIX2_/Experts/Timing
+      output = InnerDetector/Pixel/PIX2/_Experts/Timing
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
@@ -985,80 +990,80 @@ dir Pixel {
     }
 
     hist Cluster_LVL1A_ECA {
-      algorithm = Plain_GatherData#Pix_Timing_CheckHisto_Mean&BinPrint
+      algorithm = Pix_Timing_CheckHisto_Mean&BinPrint
       output = InnerDetector/Pixel/PIXECA/HitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
     hist Cluster_LVL1A_ECC {
-      algorithm = Plain_GatherData#Pix_Timing_CheckHisto_Mean&BinPrint
+      algorithm = Pix_Timing_CheckHisto_Mean&BinPrint
       output = InnerDetector/Pixel/PIXECC/HitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
     hist Cluster_LVL1A_IBL {
-      algorithm = Plain_GatherData#Pix_Timing_CheckHisto_Mean&BinPrint
+      algorithm = Pix_Timing_CheckHisto_Mean&BinPrint
       output = InnerDetector/Pixel/PIXIBL/HitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
     hist Cluster_LVL1A_B0 {
-      algorithm = Plain_GatherData#Pix_Timing_CheckHisto_Mean&BinPrint
+      algorithm = Pix_Timing_CheckHisto_Mean&BinPrint
       output = InnerDetector/Pixel/PIX0/HitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
     hist Cluster_LVL1A_B1 {
-      algorithm = Plain_GatherData#Pix_Timing_CheckHisto_Mean&BinPrint
+      algorithm = Pix_Timing_CheckHisto_Mean&BinPrint
       output = InnerDetector/Pixel/PIX1/HitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
     hist Cluster_LVL1A_B2 {
-      algorithm = Plain_GatherData#Pix_Timing_CheckHisto_Mean&BinPrint
+      algorithm = Pix_Timing_CheckHisto_Mean&BinPrint
       output = InnerDetector/Pixel/PIX2/HitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
 
     hist Cluster_LVL1A_Mod_ECA {
-      algorithm = Plain_GatherData#Pix_Timing_CheckHisto_Mean&BinPrint
+      algorithm = Pix_Timing_CheckHisto_Mean&BinPrint
       output = InnerDetector/Pixel/PIXECA/HitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
     hist Cluster_LVL1A_Mod_ECC {
-      algorithm = Plain_GatherData#Pix_Timing_CheckHisto_Mean&BinPrint
+      algorithm = Pix_Timing_CheckHisto_Mean&BinPrint
       output = InnerDetector/Pixel/PIXECC/HitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
     hist Cluster_LVL1A_Mod_IBL2D {
-      algorithm = Plain_GatherData#Pix_Timing_CheckHisto_Mean&BinPrint
+      algorithm = Pix_Timing_CheckHisto_Mean&BinPrint
       output = InnerDetector/Pixel/PIXIBL/HitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
     hist Cluster_LVL1A_Mod_IBL3D {
-      algorithm = Plain_GatherData#Pix_Timing_CheckHisto_Mean&BinPrint
+      algorithm = Pix_Timing_CheckHisto_Mean&BinPrint
       output = InnerDetector/Pixel/PIXIBL/HitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
     hist Cluster_LVL1A_Mod_B0 {
-      algorithm = Plain_GatherData#Pix_Timing_CheckHisto_Mean&BinPrint
+      algorithm = Pix_Timing_CheckHisto_Mean&BinPrint
       output = InnerDetector/Pixel/PIX0/HitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
     hist Cluster_LVL1A_Mod_B1 {
-      algorithm = Plain_GatherData#Pix_Timing_CheckHisto_Mean&BinPrint
+      algorithm = Pix_Timing_CheckHisto_Mean&BinPrint
       output = InnerDetector/Pixel/PIX1/HitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
     }
     hist Cluster_LVL1A_Mod_B2 {
-      algorithm = Plain_GatherData#Pix_Timing_CheckHisto_Mean&BinPrint
+      algorithm = Pix_Timing_CheckHisto_Mean&BinPrint
       output = InnerDetector/Pixel/PIX2/HitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Timing
@@ -1116,183 +1121,181 @@ dir Pixel {
 
 
   dir Clusters {
-
-    hist Cluster_Occupancy_IBL2D {
-      algorithm = Plain_GatherData#Pix_Occupancy_B0B1
-      output = InnerDetector/Pixel/PIXIBL/_Experts/ClusterHits
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
-    }
-    hist Cluster_Occupancy_IBL3D {
-      algorithm = Plain_GatherData#Pix_Occupancy_B0B1
-      output = InnerDetector/Pixel/PIXIBL/_Experts/ClusterHits
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
-    }
-
-    hist Clus_Occ_SizeCut_IBL2D {
-      algorithm = Plain_GatherData#Pix_Occupancy_B0B1
-      output = InnerDetector/Pixel/PIXIBL/_Experts/ClusterHits
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
-    }
-    hist Clus_Occ_SizeCut_IBL3D {
-      algorithm = Plain_GatherData#Pix_Occupancy_B0B1
-      output = InnerDetector/Pixel/PIXIBL/_Experts/ClusterHits
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
-    }
-    hist Clus_Occ_SizeCut_IBL {
-      algorithm = Plain_GatherData#Pix_Occupancy_B0B1
-      output = InnerDetector/Pixel/PIXIBL/_Experts/ClusterHits
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
-    }
-    hist Clus_Occ_SizeCut_B0 {
-      algorithm = Plain_GatherData#Pix_Occupancy_B0B1
-      output = InnerDetector/Pixel/PIX0/_Experts/ClusterHits
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
-    }
-    hist Clus_Occ_SizeCut_B1 {
-      algorithm = Plain_GatherData#Pix_Occupancy_B0B1
-      output = InnerDetector/Pixel/PIX1/_Experts/ClusterHits
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
-    }
-    hist Clus_Occ_SizeCut_B2 {
-      algorithm = Plain_GatherData#Pix_Occupancy_B2
-      output = InnerDetector/Pixel/PIX2/_Experts/ClusterHits
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
-    }
-    hist Clus_Occ_SizeCut_ECA {
-      algorithm = Plain_GatherData#Pix_Occupancy_Endcap
-      output = InnerDetector/Pixel/PIXECA/_Experts/ClusterHits
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
-    }
-    hist Clus_Occ_SizeCut_ECC {
-      algorithm = Plain_GatherData#Pix_Occupancy_Endcap
-      output = InnerDetector/Pixel/PIXECC/_Experts/ClusterHits
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
-    }
+ 
     hist Cluster_Size_Map_B0 {
-      algorithm = Plain_GatherData#Plain_GatherData#Pix_Bins_Lower_Threshold
+      algorithm = Pix_Histogram_Not_Empty
       output = InnerDetector/Pixel/PIX0/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
     hist Cluster_Size_Map_B1 {
-      algorithm = Plain_GatherData#Pix_Bins_Lower_Threshold
+      algorithm = Pix_Histogram_Not_Empty
       output = InnerDetector/Pixel/PIX1/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
     hist Cluster_Size_Map_B2 {
-      algorithm = Plain_GatherData#Pix_Bins_Lower_Threshold
+      algorithm = Pix_Histogram_Not_Empty
       output = InnerDetector/Pixel/PIX2/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
     hist Cluster_Size_Map_ECA {
-      algorithm = Plain_GatherData#Pix_Bins_Lower_Threshold
-      output = InnerDetector/Pixel/PIXCA/ClusterHits
+      algorithm = Pix_Histogram_Not_Empty
+      output = InnerDetector/Pixel/PIXECA/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
     hist Cluster_Size_Map_ECC {
-      algorithm = Plain_GatherData#Pix_Bins_Lower_Threshold
+      algorithm = Pix_Histogram_Not_Empty
       output = InnerDetector/Pixel/PIXECC/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
     hist Cluster_Size_Map_IBL {
-      algorithm = Plain_GatherData#Pix_Bins_Lower_Threshold
+      algorithm = Pix_Histogram_Not_Empty
       output = InnerDetector/Pixel/PIXIBL/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
     hist Cluster_Size_Map_IBL2D {
-      algorithm = Plain_GatherData#Pix_Bins_Lower_Threshold
+      algorithm = Pix_Histogram_Not_Empty
       output = InnerDetector/Pixel/PIXIBL/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
     hist Cluster_Size_Map_IBL3D {
-      algorithm = Plain_GatherData#Pix_Bins_Lower_Threshold
+      algorithm = Pix_Histogram_Not_Empty
       output = InnerDetector/Pixel/PIXIBL/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-
+    hist Cluster_Occupancy_IBL2D {
+      algorithm = Pix_Occupancy_B0B1
+      output = InnerDetector/Pixel/PIXIBL/_Experts/ClusterHits
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
+    }
+    hist Cluster_Occupancy_IBL3D {
+      algorithm = Pix_Occupancy_B0B1
+      output = InnerDetector/Pixel/PIXIBL/_Experts/ClusterHits
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
+    }
 
     hist Clusters_column_width_per_lumi_B0 {
-      algorithm = Plain_GatherData#Pix_Occupancy_Endcap
+      algorithm = Pix_Clusters_Column_LB
       output = InnerDetector/Pixel/PIX0/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
     hist Clusters_column_width_per_lumi_B1 {
-      algorithm = Plain_GatherData#Pix_Occupancy_Endcap
+      algorithm = Pix_Clusters_Column_LB
       output = InnerDetector/Pixel/PIX1/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
     hist Clusters_column_width_per_lumi_B2 {
-      algorithm = Plain_GatherData# Pix_Occupancy_Endcap
+      algorithm = Pix_Clusters_Column_LB
       output = InnerDetector/Pixel/PIX2/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
     hist Clusters_column_width_per_lumi_ECA {
-      algorithm = Plain_GatherData#Pix_Occupancy_Endcap
-      output = InnerDetector/Pixel/PIXCA/ClusterHits
+      algorithm = Pix_Clusters_Column_LB
+      output = InnerDetector/Pixel/PIXECA/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Clusters_columns_width_per_lumi_ECC {
-      algorithm = Plain_GatherData#Pix_Occupancy_Endcap
+    hist Clusters_column_width_per_lumi_ECC {
+      algorithm = Pix_Clusters_Column_LB
       output = InnerDetector/Pixel/PIXECC/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
     hist Clusters_column_width_per_lumi_IBL {
-      algorithm = Plain_GatherData#Pix_Occupancy_Endcap
+      algorithm = Pix_Clusters_Column_LB
       output = InnerDetector/Pixel/PIXIBL/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
     hist Clusters_column_width_per_lumi_IBL2D {
-      algorithm = Plain_GatherData#Pix_Occupancy_Endcap
+      algorithm = Pix_Clusters_ColumnRow_LB
       output = InnerDetector/Pixel/PIXIBL/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
     hist Clusters_column_width_per_lumi_IBL3D {
-      algorithm = Plain_GatherData#Pix_Occupancy_Endcap
+      algorithm = Pix_Clusters_Column_LB
       output = InnerDetector/Pixel/PIXIBL/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
 
-
     hist Clusters_row_width_per_lumi_B0 {
-      algorithm = Plain_GatherData#Pix_Occupancy_Endcap
+      algorithm  = Pix_Clusters_Row_LB
       output = InnerDetector/Pixel/PIX0/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
     hist Clusters_row_width_per_lumi_B1 {
-      algorithm = Plain_GatherData#Pix_Occupancy_Endcap
+      algorithm = Pix_Clusters_Row_LB
       output = InnerDetector/Pixel/PIX1/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
     hist Clusters_row_width_per_lumi_B2 {
-      algorithm = Plain_GatherData#Pix_Occupancy_Endcap
-      output = InnerDetector/Pixel/PIX2/ClusterHits
+      algorithm = Pix_Clusters_ColumnRow_LB
+      output = InnerDetector/Pixel/PIX2/ClusterHits	
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
     hist Clusters_row_width_per_lumi_ECA {
-      algorithm = Plain_GatherData#Pix_Occupancy_Endcap
-      output = InnerDetector/Pixel/PIXCA/ClusterHits
+      algorithm = Pix_Clusters_Row_LB
+      output = InnerDetector/Pixel/PIXECA/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
     hist Clusters_row_width_per_lumi_ECC {
-      algorithm = Plain_GatherData#Pix_Occupancy_Endcap
+      algorithm = Pix_Clusters_Row_LB
       output = InnerDetector/Pixel/PIXECC/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
     hist Clusters_row_width_per_lumi_IBL {
-      algorithm = Plain_GatherData#Pix_Occupancy_Endcap
+      algorithm = Pix_Clusters_Row_LB
       output = InnerDetector/Pixel/PIXIBL/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
     hist Clusters_row_width_per_lumi_IBL2D {
-      algorithm = Plain_GatherData#Pix_Occupancy_Endcap
+      algorithm = Pix_Clusters_Row_LB
       output = InnerDetector/Pixel/PIXIBL/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
     hist Clusters_row_width_per_lumi_IBL3D {
-      algorithm = Plain_GatherData#Pix_Occupancy_Endcap
+      algorithm = Pix_Clusters_Row_LB
       output = InnerDetector/Pixel/PIXIBL/ClusterHits
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
 
+    hist Clus_Occ_SizeCut_IBL2D {
+      algorithm = Pix_Occupancy_B0B1
+      output = InnerDetector/Pixel/PIXIBL/_Experts/ClusterHits
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
+    }
+    hist Clus_Occ_SizeCut_IBL3D {
+      algorithm = Pix_Occupancy_B0B1
+      output = InnerDetector/Pixel/PIXIBL/_Experts/ClusterHits
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
+    }
+    hist Clus_Occ_SizeCut_IBL {
+      algorithm = Pix_Occupancy_B0B1
+      output = InnerDetector/Pixel/PIXIBL/_Experts/ClusterHits
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
+    }
+    hist Clus_Occ_SizeCut_B0 {
+      algorithm = Pix_Occupancy_B0B1
+      output = InnerDetector/Pixel/PIX0/_Experts/ClusterHits
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
+    }
+    hist Clus_Occ_SizeCut_B1 {
+      algorithm = Pix_Occupancy_B0B1
+      output = InnerDetector/Pixel/PIX1/_Experts/ClusterHits
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
+    }
+    hist Clus_Occ_SizeCut_B2 {
+      algorithm = Pix_Occupancy_B2
+      output = InnerDetector/Pixel/PIX2/_Experts/ClusterHits
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
+    }
+    hist Clus_Occ_SizeCut_ECA {
+      algorithm = Pix_Occupancy_Endcap
+      output = InnerDetector/Pixel/PIXECA/_Experts/ClusterHits
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
+    }
+    hist Clus_Occ_SizeCut_ECC {
+      algorithm = Pix_Occupancy_Endcap
+      output = InnerDetector/Pixel/PIXECC/_Experts/ClusterHits
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
+    }
+
     #hist Average_Cluster_Occupancy_IBL2D {
     #  algorithm = Pix_Occupancy_B0B1
     #  output = InnerDetector/Pixel/PIXIBL/_Experts/ClusterHits
@@ -1334,11 +1337,6 @@ dir Pixel {
     #  description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     #}
 
-
-
-
-
-
     hist Cluster_ToT_IBL2D {
       algorithm = Pix_ToT_CheckHisto_Mean&GatherData
       output = InnerDetector/Pixel/PIXIBL/ClusterHits
@@ -1598,37 +1596,37 @@ dir Pixel {
     }
 
     hist Clusters_per_lumi_ECA {
-      algorithm = Plain_GatherData#Pix_LB_Bins_Diff_FromAvg
+      algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIXECA/_Experts/ClusterHitsLB
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
     hist Clusters_per_lumi_ECC {
-      algorithm = Plain_GatherData#Pix_LB_Bins_Diff_FromAvg
+      algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIXECC/_Experts/ClusterHitsLB
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
     hist Clusters_per_lumi_IBL {
-      algorithm = Plain_GatherData#Pix_LB_Bins_Diff_FromAvg
+      algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIXIBL/_Experts/ClusterHitsLB
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
     hist Clusters_per_lumi_B0 {
-      algorithm = Plain_GatherData#Pix_LB_Bins_Diff_FromAvg
+      algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIX0/_Experts/ClusterHitsLB
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
     hist Clusters_per_lumi_B1 {
-      algorithm = Plain_GatherData#Pix_LB_Bins_Diff_FromAvg
+      algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIX1/_Experts/ClusterHitsLB
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
     hist Clusters_per_lumi_B2 {
-      algorithm = Plain_GatherData#Pix_LB_Bins_Diff_FromAvg
+      algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIX2/_Experts/ClusterHitsLB
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
@@ -1654,175 +1652,46 @@ dir Pixel {
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
-    #####################
-
   }
 
-  dir ClustersOnTrack {
 
-    hist Cluster_Size_Map_B0 {
-      algorithm = Plain_GatherData#Pix_Occupancy_Endcap
-      output = InnerDetector/Pixel/PIX0/ClusterHitsOnTrack
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
-    }
-    hist Cluster_Size_Map_B1 {
-      algorithm = Plain_GatherData#Pix_Occupancy_Endcap
-      output = InnerDetector/Pixel/PIX1/ClusterHitsOnTrack
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
-    }
-    hist Cluster_Size_Map_B2 {
-      algorithm = Plain_GatherData#Pix_Occupancy_Endcap
-      output = InnerDetector/Pixel/PIX2/ClusterHitsOnTrack
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
-    }
-    hist Cluster_Size_Map_ECA {
-      algorithm = Plain_GatherData#Pix_Occupancy_Endcap
-      output = InnerDetector/Pixel/PIXCA/ClusterHitsOnTrack
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
-    }
-    hist Cluster_Size_Map_ECC {
-      algorithm = Plain_GatherData#Pix_Occupancy_Endcap
-      output = InnerDetector/Pixel/PIXECC/ClusterHitsOnTrack
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
-    }
-    hist Cluster_Size_Map_IBL {
-      algorithm = Plain_GatherData#Pix_Occupancy_Endcap
-      output = InnerDetector/Pixel/PIXIBL/ClusterHitsOnTrack
+  dir ClustersOnTrack {
+    hist Cluster_Occupancy_IBL2D {
+      algorithm = Pix_Occupancy_B0B1
+      output = InnerDetector/Pixel/PIXIBL/_Experts/ClusterHitsOnTrackLB
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Cluster_Size_Map_IBL2D {
-      algorithm = Plain_GatherData#Pix_Occupancy_Endcap
-      output = InnerDetector/Pixel/PIXIBL/ClusterHitsOnTrack
+    hist Cluster_Occupancy_IBL3D {
+      algorithm = Pix_Occupancy_B0B1
+      output = InnerDetector/Pixel/PIXIBL/_Experts/ClusterHitsOnTrackLB
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Cluster_Size_Map_IBL3D {
-      algorithm = Plain_GatherData#Pix_Occupancy_Endcap
+    hist Cluster_Occupancy_IBL {
+      algorithm = Pix_Occupancy_B0B1
       output = InnerDetector/Pixel/PIXIBL/ClusterHitsOnTrack
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-
-
-    hist Clusters_column_width_per_lumi_B0 {
-      algorithm = Pix_Occupancy_Endcap
+    hist Cluster_Occupancy_B0 {
+      algorithm = Pix_Occupancy_B0B1
       output = InnerDetector/Pixel/PIX0/ClusterHitsOnTrack
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Clusters_column_width_per_lumi_B1 {
-      algorithm = Pix_Occupancy_Endcap
+    hist Cluster_Occupancy_B1 {
+      algorithm = Pix_Occupancy_B0B1
       output = InnerDetector/Pixel/PIX1/ClusterHitsOnTrack
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Clusters_column_width_per_lumi_B2 {
-      algorithm = Pix_Occupancy_Endcap
+    hist Cluster_Occupancy_B2 {
+      algorithm = Pix_Occupancy_B2
       output = InnerDetector/Pixel/PIX2/ClusterHitsOnTrack
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Clusters_column_width_per_lumi_ECA {
+    hist Cluster_Occupancy_ECA {
       algorithm = Pix_Occupancy_Endcap
-      output = InnerDetector/Pixel/PIXCA/ClusterHitsOnTrack
+      output = InnerDetector/Pixel/PIXECA/ClusterHitsOnTrack
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     }
-    hist Clusters_columns_width_per_lumi_ECC {
-      algorithm = Pix_Occupancy_Endcap
-      output = InnerDetector/Pixel/PIXECC/ClusterHitsOnTrack
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
-    }
-    hist Clusters_column_width_per_lumi_IBL {
-      algorithm = Pix_Occupancy_Endcap
-      output = InnerDetector/Pixel/PIXIBL/ClusterHitsOnTrack
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
-    }
-    hist Clusters_column_width_per_lumi_IBL2D {
-      algorithm = Pix_Occupancy_Endcap
-      output = InnerDetector/Pixel/PIXIBL/ClusterHitsOnTrack
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
-    }
-    hist Clusters_column_width_per_lumi_IBL3D {
-      algorithm = Pix_Occupancy_Endcap
-      output = InnerDetector/Pixel/PIXIBL/ClusterHitsOnTrack
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
-    }
-
-
-    hist Clusters_row_width_per_lumi_B0 {
-      algorithm = Pix_Occupancy_Endcap
-      output = InnerDetector/Pixel/PIX0/ClusterHitsOnTrack
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
-    }
-    hist Clusters_row_width_per_lumi_B1 {
-      algorithm = Pix_Occupancy_Endcap
-      output = InnerDetector/Pixel/PIX1/ClusterHitsOnTrack
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
-    }
-    hist Clusters_row_width_per_lumi_B2 {
-      algorithm = Pix_Occupancy_Endcap
-      output = InnerDetector/Pixel/PIX2/ClusterHitsOnTrack
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
-    }
-    hist Clusters_row_width_per_lumi_ECA {
-      algorithm = Pix_Occupancy_Endcap
-      output = InnerDetector/Pixel/PIXCA/ClusterHitsOnTrack
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
-    }
-    hist Clusters_row_width_per_lumi_ECC {
-      algorithm = Pix_Occupancy_Endcap
-      output = InnerDetector/Pixel/PIXECC/ClusterHitsOnTrack
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
-    }
-    hist Clusters_row_width_per_lumi_IBL {
-      algorithm = Pix_Occupancy_Endcap
-      output = InnerDetector/Pixel/PIXIBL/ClusterHitsOnTrack
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
-    }
-    hist Clusters_row_width_per_lumi_IBL2D {
-      algorithm = Pix_Occupancy_Endcap
-      output = InnerDetector/Pixel/PIXIBL/ClusterHitsOnTrack
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
-    }
-    hist Clusters_row_width_per_lumi_IBL3D {
-      algorithm = Pix_Occupancy_Endcap
-      output = InnerDetector/Pixel/PIXIBL/ClusterHitsOnTrack
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
-    }
-
-
-
-    hist Cluster_Occupancy_IBL2D {
-      algorithm = Plain_GatherData#Pix_Occupancy_B0B1
-      output = InnerDetector/Pixel/PIXIBL/_Experts/ClusterHitsOnTrackLB
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
-    }
-    hist Cluster_Occupancy_IBL3D {
-      algorithm = Plain_GatherData#Pix_Occupancy_B0B1
-      output = InnerDetector/Pixel/PIXIBL/_Experts/ClusterHitsOnTrackLB
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
-    }
-    hist Cluster_Occupancy_IBL {
-      algorithm = Pix_Occupancy_B0B1
-      output = InnerDetector/Pixel/PIXIBL/ClusterHitsOnTrack
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
-    }
-    hist Cluster_Occupancy_B0 {
-      algorithm = Pix_Occupancy_B0B1
-      output = InnerDetector/Pixel/PIX0/ClusterHitsOnTrack
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
-    }
-    hist Cluster_Occupancy_B1 {
-      algorithm = Pix_Occupancy_B0B1
-      output = InnerDetector/Pixel/PIX1/ClusterHitsOnTrack
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
-    }
-    hist Cluster_Occupancy_B2 {
-      algorithm = Pix_Occupancy_B2
-      output = InnerDetector/Pixel/PIX2/ClusterHitsOnTrack
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
-    }
-    hist Cluster_Occupancy_ECA {
-      algorithm = Pix_Occupancy_Endcap
-      output = InnerDetector/Pixel/PIXECA/ClusterHitsOnTrack
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
-    }
-    hist Cluster_Occupancy_ECC {
+    hist Cluster_Occupancy_ECC {
       algorithm = Pix_Occupancy_Endcap
       output = InnerDetector/Pixel/PIXECC/ClusterHitsOnTrack
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
@@ -1869,129 +1738,130 @@ dir Pixel {
     #  description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
     #}
 
-    hist Cluster_QxCosAlpha_ECA {
+
+    hist Cluster_charge_ECA {
       algorithm = Pix_Charge_CheckHisto_Mean&GatherData
       output = InnerDetector/Pixel/PIXECA/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Charge_and_ToT
     }
-    hist Cluster_QxCosAlpha_ECA0 {
+    hist Cluster_charge_ECC {
       algorithm = Pix_Charge_CheckHisto_Mean&GatherData
-      output = InnerDetector/Pixel/PIXECA/ClusterHitsOnTrack
+      output = InnerDetector/Pixel/PIXECC/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Charge_and_ToT
     }
-    hist Cluster_QxCosAlpha_ECA1 {
+    hist Cluster_charge_IBL {
       algorithm = Pix_Charge_CheckHisto_Mean&GatherData
-      output = InnerDetector/Pixel/PIXECA/ClusterHitsOnTrack
+      output = InnerDetector/Pixel/PIXIBL/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Charge_and_ToT
     }
-    hist Cluster_QxCosAlpha_ECA2 {
+    hist Cluster_charge_B0 {
       algorithm = Pix_Charge_CheckHisto_Mean&GatherData
-      output = InnerDetector/Pixel/PIXECA/ClusterHitsOnTrack
+      output = InnerDetector/Pixel/PIX0/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Charge_and_ToT
     }
-    hist Cluster_QxCosAlpha_ECC {
+    hist Cluster_charge_B1 {
       algorithm = Pix_Charge_CheckHisto_Mean&GatherData
-      output = InnerDetector/Pixel/PIXECC/ClusterHitsOnTrack
+      output = InnerDetector/Pixel/PIX1/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Charge_and_ToT
     }
-    hist Cluster_QxCosAlpha_ECC0 {
+    hist Cluster_charge_B2 {
       algorithm = Pix_Charge_CheckHisto_Mean&GatherData
-      output = InnerDetector/Pixel/PIXECC/ClusterHitsOnTrack
+      output = InnerDetector/Pixel/PIX2/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Charge_and_ToT
     }
-    hist Cluster_QxCosAlpha_ECC1 {
+
+hist Cluster_QxCosAlpha_ECA {
       algorithm = Pix_Charge_CheckHisto_Mean&GatherData
-      output = InnerDetector/Pixel/PIXECC/ClusterHitsOnTrack
+      output = InnerDetector/Pixel/PIXECA/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Charge_and_ToT
     }
-    hist Cluster_QxCosAlpha_ECC2 {
+    hist Cluster_QxCosAlpha_ECA0 {
       algorithm = Pix_Charge_CheckHisto_Mean&GatherData
-      output = InnerDetector/Pixel/PIXECC/ClusterHitsOnTrack
+      output = InnerDetector/Pixel/PIXECA/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Charge_and_ToT
     }
-    hist Cluster_QxCosAlpha_IBL {
+    hist Cluster_QxCosAlpha_ECA1 {
       algorithm = Pix_Charge_CheckHisto_Mean&GatherData
-      output = InnerDetector/Pixel/PIXIBL/ClusterHitsOnTrack
+      output = InnerDetector/Pixel/PIXECA/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Charge_and_ToT
     }
-    hist Cluster_QxCosAlpha_IBL2D {
+    hist Cluster_QxCosAlpha_ECA2 {
       algorithm = Pix_Charge_CheckHisto_Mean&GatherData
-      output = InnerDetector/Pixel/PIXIBL/ClusterHitsOnTrack
+      output = InnerDetector/Pixel/PIXECA/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Charge_and_ToT
     }
-    hist Cluster_QxCosAlpha_IBL3D {
+    hist Cluster_QxCosAlpha_ECC {
       algorithm = Pix_Charge_CheckHisto_Mean&GatherData
-      output = InnerDetector/Pixel/PIXIBL/ClusterHitsOnTrack
+      output = InnerDetector/Pixel/PIXECC/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Charge_and_ToT
     }
-    hist Cluster_QxCosAlpha_B0 {
+    hist Cluster_QxCosAlpha_ECC0 {
       algorithm = Pix_Charge_CheckHisto_Mean&GatherData
-      output = InnerDetector/Pixel/PIX0/ClusterHitsOnTrack
+      output = InnerDetector/Pixel/PIXECC/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Charge_and_ToT
     }
-    hist Cluster_QxCosAlpha_B1 {
+    hist Cluster_QxCosAlpha_ECC1 {
       algorithm = Pix_Charge_CheckHisto_Mean&GatherData
-      output = InnerDetector/Pixel/PIX1/ClusterHitsOnTrack
+      output = InnerDetector/Pixel/PIXECC/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Charge_and_ToT
     }
-    hist Cluster_QxCosAlpha_B2 {
+    hist Cluster_QxCosAlpha_ECC2 {
       algorithm = Pix_Charge_CheckHisto_Mean&GatherData
-      output = InnerDetector/Pixel/PIX2/ClusterHitsOnTrack
+      output = InnerDetector/Pixel/PIXECC/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Charge_and_ToT
     }
-
-    hist Cluster_charge_ECA {
+    hist Cluster_QxCosAlpha_IBL {
       algorithm = Pix_Charge_CheckHisto_Mean&GatherData
-      output = InnerDetector/Pixel/PIXECA/ClusterHitsOnTrack
+      output = InnerDetector/Pixel/PIXIBL/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Charge_and_ToT
     }
-    hist Cluster_charge_ECC {
+    hist Cluster_QxCosAlpha_IBL2D {
       algorithm = Pix_Charge_CheckHisto_Mean&GatherData
-      output = InnerDetector/Pixel/PIXECC/ClusterHitsOnTrack
+      output = InnerDetector/Pixel/PIXIBL/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Charge_and_ToT
     }
-    hist Cluster_charge_IBL {
+    hist Cluster_QxCosAlpha_IBL3D {
       algorithm = Pix_Charge_CheckHisto_Mean&GatherData
       output = InnerDetector/Pixel/PIXIBL/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Charge_and_ToT
     }
-    hist Cluster_charge_B0 {
+    hist Cluster_QxCosAlpha_B0 {
       algorithm = Pix_Charge_CheckHisto_Mean&GatherData
       output = InnerDetector/Pixel/PIX0/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Charge_and_ToT
     }
-    hist Cluster_charge_B1 {
+    hist Cluster_QxCosAlpha_B1 {
       algorithm = Pix_Charge_CheckHisto_Mean&GatherData
       output = InnerDetector/Pixel/PIX1/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Charge_and_ToT
     }
-    hist Cluster_charge_B2 {
+    hist Cluster_QxCosAlpha_B2 {
       algorithm = Pix_Charge_CheckHisto_Mean&GatherData
       output = InnerDetector/Pixel/PIX2/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Charge_and_ToT
     }
 
-    hist Cluster_ToTxCosAlpha_IBL2D {
+hist Cluster_ToTxCosAlpha_IBL2D {
       algorithm = Pix_ToT_CheckHisto_Mean&GatherData
       output = InnerDetector/Pixel/PIXIBL/ClusterHitsOnTrack
       display = StatBox
@@ -2023,7 +1893,7 @@ dir Pixel {
     }
     hist Cluster_ToTxCosAlpha_ECA1 {
       algorithm = Pix_ToT_CheckHisto_Mean&GatherData
-      #output = InnerDetector/Pixel/PIXECA/ClusterHitsOnTrack
+      output = InnerDetector/Pixel/PIXECA/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Charge_and_ToT
     }
@@ -2059,7 +1929,7 @@ dir Pixel {
     }
     hist Cluster_ToTxCosAlpha_B0 {
       algorithm = Pix_ToT_CheckHisto_Mean&GatherData
-      #output = InnerDetector/Pixel/PIX0/ClusterHitsOnTrack
+      output = InnerDetector/Pixel/PIX0/ClusterHitsOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Charge_and_ToT
     }
@@ -2075,7 +1945,7 @@ dir Pixel {
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Charge_and_ToT
     }
-
+    
     hist num_clusters {
       algorithm = PixTrack_Noise_CheckHisto_Mean&GatherData
       output = InnerDetector/Pixel/PixelExpert/GeneralOnTrack
@@ -2120,8 +1990,138 @@ dir Pixel {
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#General_Hits
     }
+    hist Cluster_groupsize_IBL {
+      algorithm = Pix_Histogram_Not_Empty
+      output = InnerDetector/Pixel/PIXIBL/ClusterHitsOnTrack
+      display = StatBox
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#General_Hits
+    }
+
+    hist Cluster_Size_Map_B0 {
+      algorithm = Pix_Histogram_Not_Empty
+      output = InnerDetector/Pixel/PIX0/ClusterHitsOnTrack
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
+    }
+    hist Cluster_Size_Map_B1 {
+      algorithm = Pix_Histogram_Not_Empty
+      output = InnerDetector/Pixel/PIX1/ClusterHitsOnTrack
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
+    }
+    hist Cluster_Size_Map_B2 {
+      algorithm = Pix_Histogram_Not_Empty
+      output = InnerDetector/Pixel/PIX2/ClusterHitsOnTrack
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
+    }
+    hist Cluster_Size_Map_ECA {
+      algorithm = Pix_Histogram_Not_Empty
+      output = InnerDetector/Pixel/PIXECA/ClusterHitsOnTrack
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
+    }
+    hist Cluster_Size_Map_ECC {
+      algorithm = Pix_Histogram_Not_Empty
+      output = InnerDetector/Pixel/PIXECC/ClusterHitsOnTrack
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
+    }
+    hist Cluster_Size_Map_IBL {
+      algorithm = Pix_Histogram_Not_Empty
+      output = InnerDetector/Pixel/PIXIBL/ClusterHitsOnTrack
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
+    }
+    hist Cluster_Size_Map_IBL2D {
+      algorithm =  Pix_Histogram_Not_Empty
+      output = InnerDetector/Pixel/PIXIBL/ClusterHitsOnTrack
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
+    }
+    hist Cluster_Size_Map_IBL3D {
+      algorithm = Pix_Histogram_Not_Empty
+      output = InnerDetector/Pixel/PIXIBL/ClusterHitsOnTrack
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
+    }
+
+    hist Clusters_column_width_per_lumi_B0_OnTrack {
+      algorithm = Pix_Clusters_Column_LB
+      output = InnerDetector/Pixel/PIX0/ClusterHitsOnTrack
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
+    }
+    hist Clusters_column_width_per_lumi_B1_OnTrack {
+      algorithm = Pix_Clusters_Column_LB
+      output = InnerDetector/Pixel/PIX1/ClusterHitsOnTrack
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
+    }
+    hist Clusters_column_width_per_lumi_B2_OnTrack {
+      algorithm = Pix_Clusters_Column_LB
+      output = InnerDetector/Pixel/PIX2/ClusterHitsOnTrack
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
+    }
+    hist Clusters_column_width_per_lumi_ECA_OnTrack {
+      algorithm = Pix_Clusters_Column_LB
+      output = InnerDetector/Pixel/PIXECA/ClusterHitsOnTrack
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
+    }
+    hist Clusters_column_width_per_lumi_ECC_OnTrack {
+      algorithm = Pix_Clusters_Column_LB
+      output = InnerDetector/Pixel/PIXECC/ClusterHitsOnTrack
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
+    }
+    hist Clusters_column_width_per_lumi_IBL_OnTrack {
+      algorithm = Pix_Clusters_Column_LB
+      output = InnerDetector/Pixel/PIXIBL/ClusterHitsOnTrack
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
+    }
+    hist Clusters_column_width_per_lumi_IBL2D_OnTrack {
+      algorithm = Pix_Clusters_Column_LB
+      output = InnerDetector/Pixel/PIXIBL/ClusterHitsOnTrack
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
+    }
+    hist Clusters_column_width_per_lumi_IBL3D_OnTrack {
+      algorithm = Pix_Clusters_Column_LB
+      output = InnerDetector/Pixel/PIXIBL/ClusterHitsOnTrack
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
+    }
+
+
+    hist Clusters_row_width_per_lumi_B0_OnTrack {
+      algorithm = Pix_Clusters_Row_LB
+      output = InnerDetector/Pixel/PIX0/ClusterHitsOnTrack
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
+    }
+    hist Clusters_row_width_per_lumi_B1_OnTrack {
+      algorithm = Pix_Clusters_Row_LB
+      output = InnerDetector/Pixel/PIX1/ClusterHitsOnTrack
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
+    }
+    hist Clusters_row_width_per_lumi_B2_OnTrack {
+      algorithm = Pix_Clusters_Row_LB
+      output = InnerDetector/Pixel/PIX2/ClusterHitsOnTrack
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
+    }
+    hist Clusters_row_width_per_lumi_ECA_OnTrack {
+      algorithm = Pix_Clusters_Row_LB
+      output = InnerDetector/Pixel/PIXECA/ClusterHitsOnTrack
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
+    }
+    hist Clusters_row_width_per_lumi_ECC_OnTrack {
+      algorithm = Pix_Clusters_Row_LB
+      output = InnerDetector/Pixel/PIXECC/ClusterHitsOnTrack
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
+    }
+    hist Clusters_row_width_per_lumi_IBL_OnTrack {
+      algorithm = Pix_Clusters_Row_LB
+      output = InnerDetector/Pixel/PIXIBL/ClusterHitsOnTrack
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
+    }
+    hist Clusters_row_width_per_lumi_IBL2D_OnTrack {
+      algorithm = Pix_Clusters_Row_LB
+      output = InnerDetector/Pixel/PIXIBL/ClusterHitsOnTrack
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
+    }
+    hist Clusters_row_width_per_lumi_IBL3D_OnTrack {
+      algorithm = Pix_Clusters_Row_LB
+      output = InnerDetector/Pixel/PIXIBL/ClusterHitsOnTrack
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Occupancies
+    }
 
-    #hist Cluster_groupsiz@1 {
+    #hist Cluster_groupsize@1 {
     #  algorithm = Pix_Histogram_Not_Empty
     #  output = InnerDetector/Pixel/PixelExpert/GeneralOnTrack
     #  display = StatBox,AxisRange(0,20,"X")
@@ -2158,14 +2158,14 @@ dir Pixel {
     #  description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#General_Hits
     #}
 
-    hist TotalClusters_per_lumi_OnTrack {
+    hist TotalClusters_per_lumi {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PixelExpert/GeneralOnTrack
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
 
-    hist Clusters_per_lumi_OnTrack {
+    hist Clusters_per_lumi {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PixelExpert/GeneralOnTrack
       display = StatBox
@@ -2173,37 +2173,37 @@ dir Pixel {
     }
 
     hist Clusters_per_lumi_ECA {
-      algorithm = Plain_GatherData#Pix_LB_Bins_Diff_FromAvg
+      algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIXECA/_Experts/ClusterHitsOnTrackLB
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
     hist Clusters_per_lumi_ECC {
-      algorithm = Plain_GatherData#Pix_LB_Bins_Diff_FromAvg
+      algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIXECC/_Experts/ClusterHitsOnTrackLB
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
     hist Clusters_per_lumi_IBL {
-      algorithm = Plain_GatherData#Pix_LB_Bins_Diff_FromAvg
+      algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIXIBL/_Experts/ClusterHitsOnTrackLB
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
     hist Clusters_per_lumi_B0 {
-      algorithm = Plain_GatherData#Pix_LB_Bins_Diff_FromAvg
+      algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIX0/_Experts/ClusterHitsOnTrackLB
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
     hist Clusters_per_lumi_B1 {
-      algorithm = Plain_GatherData#Pix_LB_Bins_Diff_FromAvg
+      algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIX1/_Experts/ClusterHitsOnTrackLB
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
     hist Clusters_per_lumi_B2 {
-      algorithm = Plain_GatherData#Pix_LB_Bins_Diff_FromAvg
+      algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PIX2/_Experts/ClusterHitsOnTrackLB
       display = StatBox
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
@@ -2265,7 +2265,6 @@ dir Pixel {
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
 
-
     hist DisabledModules_per_lumi {
       algorithm = Pix_DisabledLB_CheckHisto_Mean&GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/ALL
@@ -2288,12 +2287,12 @@ dir Pixel {
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
     hist DisabledModules_per_lumi_IBL2D {
-      algorithm = Plain_GatherData#Pix_DisabledLB_CheckHisto_Mean_B0B1&GatherData
+      algorithm = Pix_DisabledLB_CheckHisto_Mean_B0B1&GatherData
       output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
     hist DisabledModules_per_lumi_IBL3D {
-      algorithm = Plain_GatherData#Pix_DisabledLB_CheckHisto_Mean_B0B1&GatherData
+      algorithm = Pix_DisabledLB_CheckHisto_Mean_B0B1&GatherData
       output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
     }
@@ -2363,8 +2362,60 @@ dir Pixel {
 
 
   dir Errors {
+  
+  hist SyncErrors_Mod_B0 {
+      algorithm = Pix_NonZero_Errors
+      output = InnerDetector/Pixel/PIX0/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
+    }
+  hist SyncErrors_Mod_B1 {
+      algorithm = Pix_NonZero_Errors
+      output = InnerDetector/Pixel/PIX1/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
+    }
+  hist SyncErrors_Mod_B2 {
+      algorithm = Pix_NonZero_Errors
+      output = InnerDetector/Pixel/PIX2/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
+    }
+  hist SyncErrors_Mod_ECA {
+      algorithm = Pix_NonZero_Errors
+      output = InnerDetector/Pixel/PIXECA/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
+    }
+  hist SyncErrors_Mod_ECC {
+      algorithm = Pix_NonZero_Errors
+      output = InnerDetector/Pixel/PIXECC/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
+    }
+
+  hist SyncErrors_ROD_B0 {
+      algorithm = Pix_NonZero_Errors
+      output = InnerDetector/Pixel/PIX0/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
+    }
+  hist SyncErrors_ROD_B1 {
+      algorithm = Pix_NonZero_Errors
+      output = InnerDetector/Pixel/PIX1/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
+    }
+  hist SyncErrors_ROD_B2 {
+      algorithm = Pix_NonZero_Errors
+      output = InnerDetector/Pixel/PIX2/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
+    }
+  hist SyncErrors_ROD_ECA {
+      algorithm = Pix_NonZero_Errors
+      output = InnerDetector/Pixel/PIXECA/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
+    }
+  hist SyncErrors_ROD_ECC {
+      algorithm = Pix_NonZero_Errors
+      output = InnerDetector/Pixel/PIXECC/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
+    }
 
-    hist SyncErrors_Mod_Frac_per_event_IBL {
+  hist SyncErrors_Mod_Frac_per_event_IBL {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIXIBL/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
@@ -2372,97 +2423,93 @@ dir Pixel {
 
     hist SyncErrors_Mod_Frac_per_event_B0 {
       algorithm = Pix_NonZero_Errors
-      output = InnerDetector/Pixel/PIXIBL/DisableAndErrorsLB
+      output = InnerDetector/Pixel/PIX0/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
     hist SyncErrors_Mod_Frac_per_event_B1 {
       algorithm = Pix_NonZero_Errors
-      output = InnerDetector/Pixel/PIXIBL/DisableAndErrorsLB
+      output = InnerDetector/Pixel/PIX1/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
     hist SyncErrors_Mod_Frac_per_event_B2 {
       algorithm = Pix_NonZero_Errors
-      output = InnerDetector/Pixel/PIXIBL/DisableAndErrorsLB
+      output = InnerDetector/Pixel/PIX2/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
     hist SyncErrors_Mod_Frac_per_event_ECA {
       algorithm = Pix_NonZero_Errors
-      output = InnerDetector/Pixel/PIXIBL/DisableAndErrorsLB
+      output = InnerDetector/Pixel/PIXECA/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
     hist SyncErrors_Mod_Frac_per_event_ECC {
       algorithm = Pix_NonZero_Errors
-      output = InnerDetector/Pixel/PIXIBL/DisableAndErrorsLB
+      output = InnerDetector/Pixel/PIXECC/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
 
-    hist SyncErrors_Rod_Frac_per_event_IBL {
+    hist SyncErrors_ROD_Frac_per_event_IBL {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIXIBL/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
 
-    hist SyncErrors_Rod_Frac_per_event_B0 {
+    hist SyncErrors_ROD_Frac_per_event_B0 {
       algorithm = Pix_NonZero_Errors
-      output = InnerDetector/Pixel/PIXIBL/DisableAndErrorsLB
+      output = InnerDetector/Pixel/PIX0/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist SyncErrors_Rod_Frac_per_event_B1 {
+    hist SyncErrors_ROD_Frac_per_event_B1 {
       algorithm = Pix_NonZero_Errors
-      output = InnerDetector/Pixel/PIXIBL/DisableAndErrorsLB
+      output = InnerDetector/Pixel/PIX1/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist SyncErrors_Rod_Frac_per_event_B2 {
+    hist SyncErrors_ROD_Frac_per_event_B2 {
       algorithm = Pix_NonZero_Errors
-      output = InnerDetector/Pixel/PIXIBL/DisableAndErrorsLB
+      output = InnerDetector/Pixel/PIX2/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist SyncErrors_Rod_Frac_per_event_ECA {
+    hist SyncErrors_ROD_Frac_per_event_ECA {
       algorithm = Pix_NonZero_Errors
-      output = InnerDetector/Pixel/PIXIBL/DisableAndErrorsLB
+      output = InnerDetector/Pixel/PIXECA/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist SyncErrors_Rod_Frac_per_event_ECC {
+    hist SyncErrors_ROD_Frac_per_event_ECC {
       algorithm = Pix_NonZero_Errors
-      output = InnerDetector/Pixel/PIXIBL/DisableAndErrorsLB
+      output = InnerDetector/Pixel/PIXECC/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
 
-
     hist DisabledAndSyncErrorsModules_per_lumi_IBL_byPostProcess {
-      algorithm = Pix_NonZero_Errors
+      algorithm = Pix_Disabled_Synch_Errors
       output = InnerDetector/Pixel/PIXIBL/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
 
     hist DisabledAndSyncErrorsModules_per_lumi_B0_byPostProcess {
-      algorithm = Pix_NonZero_Errors
-      output = InnerDetector/Pixel/PIXIBL/DisableAndErrorsLB
+      algorithm = Pix_Disabled_Synch_Errors
+      output = InnerDetector/Pixel/PIX0/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
     hist DisabledAndSyncErrorsModules_per_lumi_B1_byPostProcess {
-      algorithm = Pix_NonZero_Errors
-      output = InnerDetector/Pixel/PIXIBL/DisableAndErrorsLB
+      algorithm = Pix_Disabled_Synch_Errors
+      output = InnerDetector/Pixel/PIX1/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
     hist DisabledAndSyncErrorsModules_per_lumi_B2_byPostProcess {
-      algorithm = Pix_NonZero_Errors
-      output = InnerDetector/Pixel/PIXIBL/DisableAndErrorsLB
+      algorithm = Pix_Disabled_Synch_Errors
+      output = InnerDetector/Pixel/PIX2/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
     hist DisabledAndSyncErrorsModules_per_lumi_ECA_byPostProcess {
-      algorithm = Pix_NonZero_Errors
-      output = InnerDetector/Pixel/PIXIBL/DisableAndErrorsLB
+      algorithm = Pix_Disabled_Synch_Errors
+      output = InnerDetector/Pixel/PIXECA/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
     hist DisabledAndSyncErrorsModules_per_lumi_ECC_byPostProcess {
-      algorithm = Pix_NonZero_Errors
-      output = InnerDetector/Pixel/PIXIBL/DisableAndErrorsLB
+      algorithm = Pix_Disabled_Synch_Errors
+      output = InnerDetector/Pixel/PIXECC/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-
-
-
     hist ErrorBit_per_lumi_IBL {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIXIBL/DisableAndErrorsLB
@@ -2634,7 +2681,6 @@ dir Pixel {
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
 
-
     hist TimeoutErrors_IBL_byPostProcess {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIXIBL/DisableAndErrors
@@ -2692,7 +2738,7 @@ dir Pixel {
     }
     hist TimeoutErrorsFrac_per_event_ECA {
       #algorithm = Pix_NonZero_Errors
-      algorithm = Pix_Frac_Errors 
+      algorithm = Pix_Frac_Errors
       output = InnerDetector/Pixel/PIXECA/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
@@ -2703,8 +2749,6 @@ dir Pixel {
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
 
-
-
     hist OpticalErrors_IBL_byPostProcess {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIXIBL/DisableAndErrors
@@ -2774,8 +2818,6 @@ dir Pixel {
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
 
-
-
     hist TruncErrors_IBL_byPostProcess {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIXIBL/DisableAndErrors
@@ -2845,7 +2887,6 @@ dir Pixel {
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
 
-
     hist SyncErrors_IBL_byPostProcess {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIXIBL/DisableAndErrors
@@ -2877,7 +2918,7 @@ dir Pixel {
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
 
-    # adding SyncErrors_Mod_per_lumi
+    # adding SyncErrors_Mod_per_lumi 
     hist SyncErrors_Mod_per_lumi_IBL {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
@@ -2919,7 +2960,6 @@ dir Pixel {
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
     ################################
-
     # adding SyncErrors_ROD_per_lumi
     hist SyncErrors_ROD_per_lumi_IBL {
       algorithm = Pix_NonZero_Errors
@@ -3106,170 +3146,689 @@ dir Pixel {
     }
     hist SEU_Errors_per_lumi_ECC {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    }
+
+    hist TimeoutErrors_per_lumi_PIX {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PixelExpert/Errors/ALL
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    }
+
+    hist TimeoutErrors_per_lumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    }
+    hist TimeoutErrors_per_lumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    }
+    hist TimeoutErrors_per_lumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    }
+    hist TimeoutErrors_per_lumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    }
+    hist TimeoutErrors_per_lumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    }
+    hist TimeoutErrors_per_lumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    }
+
+    hist TruncationErrors_per_lumi_PIX {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PixelExpert/Errors/ALL
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    }
+
+    hist TruncationErrors_per_lumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    }
+    hist TruncationErrors_per_lumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    }
+    hist TruncationErrors_per_lumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    }
+    hist TruncationErrors_per_lumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    }
+    hist TruncationErrors_per_lumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    }
+    hist TruncationErrors_per_lumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    }
+
+    hist SyncErrors_per_lumi_PIX {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PixelExpert/Errors/ALL
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    }
+
+    hist SyncErrors_per_lumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    }
+    hist SyncErrors_per_lumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    }
+    hist SyncErrors_per_lumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    }
+    hist SyncErrors_per_lumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    }
+    hist SyncErrors_per_lumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    }
+    hist SyncErrors_per_lumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    }
+
+    #hist SyncErrorsFrac_per_event_IBL {
+    #  algorithm = Plain_GatherData
+    #  output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+    #  description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    #}
+    #hist SyncErrorsFrac_per_event_B0 {
+    #  algorithm = Plain_GatherData
+    #  output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+    #  description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    #}
+    #hist SyncErrorsFrac_per_event_B1 {
+    #  algorithm = Plain_GatherData
+    #  output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+    #  description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    #}
+    #hist SyncErrorsFrac_per_event_B2 {
+    #  algorithm = Plain_GatherData
+    #  output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+    #  description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    #}
+    #hist SyncErrorsFrac_per_event_ECA {
+    #  algorithm = Plain_GatherData
+    #  output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+    #  description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    #}
+    #hist SyncErrorsFrac_per_event_ECC {
+    #  algorithm = Plain_GatherData
+    #  output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+    #  description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    #}
+
+    #hist OpticalErrorsFrac_per_event_IBL {
+    #  algorithm = Plain_GatherData
+    #  output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+    #  description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    #}
+    #hist OpticalErrorsFrac_per_event_B0 {
+    #  algorithm = Plain_GatherData
+    #  output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+    #  description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    #}
+    #hist OpticalErrorsFrac_per_event_B1 {
+    #  algorithm = Plain_GatherData
+    #  output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+    #  description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    #}
+    #hist OpticalErrorsFrac_per_event_B2 {
+    #  algorithm = Plain_GatherData
+    #  output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+    #  description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    #}
+    #hist OpticalErrorsFrac_per_event_ECA {
+    #  algorithm = Plain_GatherData
+    #  output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+    #  description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    #}
+    #hist OpticalErrorsFrac_per_event_ECC {
+    #  algorithm = Plain_GatherData
+    #  output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+    #  description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    #}
+
+    #hist SEUErrorsFrac_per_event_IBL {
+    #  algorithm = Plain_GatherData
+    #  output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+    #  description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    #}
+    #hist SEUErrorsFrac_per_event_B0 {
+    #  algorithm = Plain_GatherData
+    #  output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+    #  description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    #}
+    #hist SEUErrorsFrac_per_event_B1 {
+    #  algorithm = Plain_GatherData
+    #  output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+    #  description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    #}
+    #hist SEUErrorsFrac_per_event_B2 {
+    #  algorithm = Plain_GatherData
+    #  output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+    #  description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    #}
+    #hist SEUErrorsFrac_per_event_ECA {
+    #  algorithm = Plain_GatherData
+    #  output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+    #  description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    #}
+    #hist SEUErrorsFrac_per_event_ECC {
+    #  algorithm = Plain_GatherData
+    #  output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+    #  description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    #}
+
+    ## POST PROCESS 
+    hist DisabledAndSyncErrorsModules_per_lumi_B0_byPostProcess {
+      algorithm = Pix_Disabled_Synch_Errors
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    }
+    hist DisabledAndSyncErrorsModules_per_lumi_B1_byPostProcess {
+      algorithm = Pix_Disabled_Synch_Errors
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    }
+    hist DisabledAndSyncErrorsModules_per_lumi_B2_byPostProcess {
+      algorithm = Pix_Disabled_Synch_Errors
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    }
+    hist DisabledAndSyncErrorsModules_per_lumi_IBL_byPostProcess {
+      algorithm = Pix_Disabled_Synch_Errors
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    }
+    hist DisabledAndSyncErrorsModules_per_lumi_IBL2D_byPostProcess {
+      algorithm = Pix_Disabled_Synch_Errors
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    }
+    hist DisabledAndSyncErrorsModules_per_lumi_IBL3D_byPostProcess {
+      algorithm = Pix_Disabled_Synch_Errors
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    }
+    hist DisabledAndSyncErrorsModules_per_lumi_ECA_byPostProcess {
+      algorithm = Pix_Disabled_Synch_Errors
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    }
+    hist DisabledAndSyncErrorsModules_per_lumi_ECC_byPostProcess {
+      algorithm = Pix_Disabled_Synch_Errors
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+    }
+  }
+  dir ErrorsExpert {
+ ##B0 B1 B2 ECA ECC _Experts/DisableAndErrors
+
+    hist FE_Warning_Map_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      display = StatBox
+    }
+    hist FE_Warning_Map_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      display = StatBox
+    }
+    hist FE_Warning_Map_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      display = StatBox
+    }
+    hist FE_Warning_Map_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      display = StatBox
+    }
+    hist FE_Warning_Map_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      display = StatBox
+    }
+
+
+    hist Mod_Sync_BCID1_errors_Map_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      display = StatBox
+    }
+    hist Mod_Sync_BCID1_errors_Map_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      display = StatBox
+    }
+    hist Mod_Sync_BCID1_errors_Map_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      display = StatBox
+    }
+    hist Mod_Sync_BCID1_errors_Map_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      display = StatBox
+    }
+    hist Mod_Sync_BCID1_errors_Map_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      display = StatBox
+    }
+
+
+    hist Mod_Sync_BCID2_errors_Map_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      display = StatBox
+    }
+    hist Mod_Sync_BCID2_errors_Map_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      display = StatBox
+    }
+    hist Mod_Sync_BCID2_errors_Map_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      display = StatBox
+    }
+    hist Mod_Sync_BCID2_errors_Map_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      display = StatBox
+    }
+    hist Mod_Sync_BCID2_errors_Map_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      display = StatBox
+    }
+
+
+    hist Mod_Sync_LVLID_errors_Map_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      display = StatBox
+    }
+    hist Mod_Sync_LVLID_errors_Map_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors	
+      display = StatBox
+    }
+    hist Mod_Sync_LVLID_errors_Map_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      display = StatBox
+    }
+    hist Mod_Sync_LVLID_errors_Map_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      display = StatBox
+    }
+    hist Mod_Sync_LVLID_errors_Map_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      display = StatBox
+    }
+
+
+    hist Mod_Trunc_EOC_errors_Map_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      display = StatBox
+    }
+    hist Mod_Trunc_EOC_errors_Map_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      display = StatBox
+    }
+    hist Mod_Trunc_EOC_errors_Map_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      display = StatBox
+    }
+    hist Mod_Trunc_EOC_errors_Map_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      display = StatBox
+    }
+    hist Mod_Trunc_EOC_errors_Map_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      display = StatBox
+    }
+
+
+    hist Mod_Trunc_EoE_Overflow_errors_Map_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      display = StatBox
+    }
+    hist _Mod_Trunc_EoE_Overflow_errors_MapB1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      display = StatBox
+    }
+    hist Mod_Trunc_EoE_Overflow_errors_Map_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      display = StatBox
+    }
+    hist Mod_Trunc_EoE_Overflow_errors_Map_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      display = StatBox
+    }
+    hist Mod_Trunc_EoE_Overflow_errors_Map_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      display = StatBox
+    }
+
+
+    hist Mod_Trunc_Hit_Overflow_errors_Map_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      display = StatBox
+    }
+    hist Mod_Trunc_Hit_Overflow_errors_Map_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      display = StatBox
+    }
+    hist Mod_Trunc_Hit_Overflow_errors_Map_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      display = StatBox
+    }
+    hist Mod_Trunc_Hit_Overflow_errors_Map_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      display = StatBox
+    }
+    hist Mod_Trunc_Hit_Overflow_errors_Map_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      display = StatBox
+    }
+
+
+    hist Optical_Errors_Map_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      display = StatBox
+    }
+    hist Optical_Errors_Map_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      display = StatBox
+    }
+    hist Optical_Errors_Map_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      display = StatBox
+    }
+    hist Optical_Errors_Map_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      display = StatBox
+    }
+    hist Optical_Errors_Map_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      display = StatBox
+    }
+
+
+    hist ROD_Sync_BCIS_errors_Map_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      display = StatBox
+    }
+    hist ROD_Sync_BCIS_errors_Map_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      display = StatBox
+    }
+    hist ROD_Sync_BCIS_errors_Map_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      display = StatBox
+    }
+    hist ROD_Sync_BCIS_errors_Map_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      display = StatBox
+    }
+    hist ROD_Sync_BCIS_errors_Map_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      display = StatBox
+    }
+
+
+    hist ROD_Sync_LVL1ID_errors_Map_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      display = StatBox
+    }
+    hist ROD_Sync_LVL1ID_errors_Map_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      display = StatBox
+    }
+    hist ROD_Sync_LVL1ID_errors_Map_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      display = StatBox
+    }
+    hist ROD_Sync_LVL1ID_errors_Map_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      display = StatBox
     }
-
-    hist TimeoutErrors_per_lumi_PIX {
+    hist ROD_Sync_LVL1ID_errors_Map_ECC {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/ALL
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      display = StatBox
     }
 
-    hist TimeoutErrors_per_lumi_B0 {
+
+    hist ROD_Timeout_Map_B0 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      display = StatBox
     }
-    hist TimeoutErrors_per_lumi_B1 {
+    hist ROD_Timeout_Map_B1 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      display = StatBox
     }
-    hist TimeoutErrors_per_lumi_B2 {
+    hist ROD_Timeout_Map_B2 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      display = StatBox
     }
-    hist TimeoutErrors_per_lumi_IBL {
+    hist ROD_Timeout_Map_ECA {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      display = StatBox
     }
-    hist TimeoutErrors_per_lumi_ECA {
+    hist ROD_Timeout_Map_ECC {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      display = StatBox
     }
-    hist TimeoutErrors_per_lumi_ECC {
+
+
+    hist ROD_Trunc_HT_Limit_errors_Map_B0 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      display = StatBox
     }
-
-    hist TruncationErrors_per_lumi_PIX {
+    hist ROD_Trunc_HT_Limit_errors_Map_B1 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/ALL
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      display = StatBox
     }
-
-    hist TruncationErrors_per_lumi_B0 {
+    hist ROD_Trunc_HT_Limit_errors_Map_B2 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      display = StatBox
     }
-    hist TruncationErrors_per_lumi_B1 {
+    hist ROD_Trunc_HT_Limit_errors_Map_ECA {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      display = StatBox
     }
-    hist TruncationErrors_per_lumi_B2 {
+    hist ROD_Trunc_HT_Limit_errors_Map_ECC {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      display = StatBox
     }
-    hist TruncationErrors_per_lumi_IBL {
+
+
+    hist ROD_Trunc_ROD_OF_errors_Map_B0 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      display = StatBox
     }
-    hist TruncationErrors_per_lumi_ECA {
+    hist ROD_Trunc_ROD_OF_errors_Map_B1 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      display = StatBox
     }
-    hist TruncationErrors_per_lumi_ECC {
+    hist ROD_Trunc_ROD_OF_errors_Map_B2 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      display = StatBox
     }
-
-    hist SyncErrors_per_lumi_PIX {
+    hist ROD_Trunc_ROD_OF_errors_Map_ECA {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/ALL
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      display = StatBox
     }
-
-    hist SyncErrors_per_lumi_B0 {
+    hist ROD_Trunc_ROD_OF_errors_Map_ECC {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      display = StatBox
     }
-    hist SyncErrors_per_lumi_B1 {
+
+
+    hist SEU_Hamming_Map_B0 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      display = StatBox
     }
-    hist SyncErrors_per_lumi_B2 {
+    hist SEU_Hamming_Map_B1 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      display = StatBox
     }
-    hist SyncErrors_per_lumi_IBL {
+    hist SEU_Hamming_Map_B2 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      display = StatBox
     }
-    hist SyncErrors_per_lumi_ECA {
+    hist SEU_Hamming_Map_ECA {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      display = StatBox
     }
-    hist SyncErrors_per_lumi_ECC {
+    hist SEU_Hamming_Map_ECC {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      display = StatBox
     }
 
 
-
-    ## POST PROCESS
-    hist DisabledAndSyncErrorsModules_per_lumi_B0_byPostProcess {
+    hist SEU_Hit_Parity_Map_B0 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      display = StatBox
     }
-    hist DisabledAndSyncErrorsModules_per_lumi_B1_byPostProcess {
+    hist SEU_Hit_Parity_Map_B1 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      display = StatBox
     }
-    hist DisabledAndSyncErrorsModules_per_lumi_B2_byPostProcess {
+    hist SEU_Hit_Parity_Map_B2 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      display = StatBox
     }
-    hist DisabledAndSyncErrorsModules_per_lumi_IBL_byPostProcess {
+    hist SEU_Hit_Parity_Map_ECA {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      display = StatBox
     }
-    hist DisabledAndSyncErrorsModules_per_lumi_IBL2D_byPostProcess {
+    hist SEU_Hit_Parity_Map_ECC {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      display = StatBox
     }
-    hist DisabledAndSyncErrorsModules_per_lumi_IBL3D_byPostProcess {
+
+
+    hist SEU_Register_Parity_Map_B0 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      display = StatBox
     }
-    hist DisabledAndSyncErrorsModules_per_lumi_ECA_byPostProcess {
+    hist SEU_Register_Parity_Map_B1 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      display = StatBox
     }
-    hist DisabledAndSyncErrorsModules_per_lumi_ECC_byPostProcess {
+    hist SEU_Register_Parity_Map_B2 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
-      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#LB_Dependence
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      display = StatBox
+    }
+    hist SEU_Register_Parity_Map_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      display = StatBox
+    }
+    hist SEU_Register_Parity_Map_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      display = StatBox
     }
-
-
-  }
-
-
-  dir ErrorsExpert {
 
 
     ##IBL _Experts/DisableAndErrors
@@ -3307,6 +3866,7 @@ dir Pixel {
       output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
       display = StatBox
     }
+
     hist Hamming_code_0_errors_Map_IBL {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
@@ -3445,7 +4005,7 @@ dir Pixel {
     ##B0 B1 B2 ECA ECC _Experts/DisableAndErrors
 
 
-    hist FE_Warning_Map_BO {
+    hist FE_Warning_Map_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
       display = StatBox
@@ -3472,7 +4032,7 @@ dir Pixel {
     }
 
 
-    hist Mod_Sync_BCID1_errors_Map_BO {
+    hist Mod_Sync_BCID1_errors_Map_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
       display = StatBox
@@ -3499,7 +4059,7 @@ dir Pixel {
     }
 
 
-    hist Mod_Sync_BCID2_errors_Map_BO {
+    hist Mod_Sync_BCID2_errors_Map_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
       display = StatBox
@@ -3526,7 +4086,7 @@ dir Pixel {
     }
 
 
-    hist Mod_Sync_LVLID_errors_Map_BO {
+    hist Mod_Sync_LVLID_errors_Map_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
       display = StatBox
@@ -3553,7 +4113,7 @@ dir Pixel {
     }
 
 
-    hist Mod_Trunc_EOC_errors_Map_BO {
+    hist Mod_Trunc_EOC_errors_Map_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
       display = StatBox
@@ -3580,7 +4140,7 @@ dir Pixel {
     }
 
 
-    hist Mod_Trunc_EoE_Overflow_errors_Map_BO {
+    hist Mod_Trunc_EoE_Overflow_errors_Map_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
       display = StatBox
@@ -3607,7 +4167,7 @@ dir Pixel {
     }
 
 
-    hist Mod_Trunc_Hit_Overflow_errors_Map_BO {
+    hist Mod_Trunc_Hit_Overflow_errors_Map_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
       display = StatBox
@@ -3634,7 +4194,7 @@ dir Pixel {
     }
 
 
-    hist Optical_Errors_Map_BO {
+    hist Optical_Errors_Map_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
       display = StatBox
@@ -3661,34 +4221,34 @@ dir Pixel {
     }
 
 
-    hist ROD_Sync_BCIS_errors_Map_BO {
+    hist ROD_Sync_BCID_errors_Map_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
       display = StatBox
     }
-    hist ROD_Sync_BCIS_errors_Map_B1 {
+    hist ROD_Sync_BCID_errors_Map_B1 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
       display = StatBox
     }
-    hist ROD_Sync_BCIS_errors_Map_B2 {
+    hist ROD_Sync_BCID_errors_Map_B2 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
       display = StatBox
     }
-    hist ROD_Sync_BCIS_errors_Map_ECA {
+    hist ROD_Sync_BCID_errors_Map_ECA {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
       display = StatBox
     }
-    hist ROD_Sync_BCIS_errors_Map_ECC {
+    hist ROD_Sync_BCID_errors_Map_ECC {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
       display = StatBox
     }
 
 
-    hist ROD_Sync_LVL1ID_errors_Map_BO {
+    hist ROD_Sync_LVL1ID_errors_Map_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
       display = StatBox
@@ -3715,7 +4275,7 @@ dir Pixel {
     }
 
 
-    hist ROD_Timeout_Map_BO {
+    hist ROD_Timeout_Map_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
       display = StatBox
@@ -3742,7 +4302,7 @@ dir Pixel {
     }
 
 
-    hist ROD_Trunc_HT_Limit_errors_Map_BO {
+    hist ROD_Trunc_HT_Limit_errors_Map_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
       display = StatBox
@@ -3769,7 +4329,7 @@ dir Pixel {
     }
 
 
-    hist ROD_Trunc_ROD_OF_errors_Map_BO {
+    hist ROD_Trunc_ROD_OF_errors_Map_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
       display = StatBox
@@ -3796,7 +4356,7 @@ dir Pixel {
     }
 
 
-    hist SEU_Hamming_Map_BO {
+    hist SEU_Hamming_Map_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
       display = StatBox
@@ -3823,7 +4383,7 @@ dir Pixel {
     }
 
 
-    hist SEU_Hit_Parity_Map_BO {
+    hist SEU_Hit_Parity_Map_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
       display = StatBox
@@ -3850,7 +4410,7 @@ dir Pixel {
     }
 
 
-    hist SEU_Register_Parity_Map_BO {
+    hist SEU_Register_Parity_Map_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
       display = StatBox
@@ -3878,40 +4438,44 @@ dir Pixel {
 
 
 
+
+
+
+#############
     hist Bad_Module_Errors_PIX {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors
-      display = StatBox
+      display = LogY
     }
     hist Bad_Module_Errors_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors
-      display = StatBox
+      display = LogY
     }
     hist Bad_Module_Errors_B1 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors
-      display = StatBox
+      display = LogY
     }
     hist Bad_Module_Errors_B2 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors
-      display = StatBox
+      display = LogY
     }
     hist Bad_Module_Errors_ECA {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors
-      display = StatBox
+      display = LogY
     }
     hist Bad_Module_Errors_ECC {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors
-      display = StatBox
+      display = LogY
     }
     hist Bad_Module_Errors_IBL {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors
-      display = StatBox
+      display = LogY
     }
 
     hist FE_Warning_per_lumiMap_ECA {
@@ -4085,7 +4649,6 @@ dir Pixel {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_EoE_Overflow
     }
-
     hist Mod_Trunc_Hit_Overflow_errors_per_lumi_B0 {
       algorithm = Plain_GatherData
       output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_Hit_Overflow
@@ -4706,7 +5269,7 @@ dir Pixel {
     #  display = StatBox
     #  description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Tracks
     #}
-
+    
     ### Track State On Surface: Hole
     hist TSOS_Hole_IBL {
       algorithm = Plain_GatherData
@@ -5088,7 +5651,41 @@ compositeAlgorithm Pix_Bins_GreaterThan_Threshold&BinPrint {
   libnames = libdqm_algorithms.so
   subalgs = Bins_GreaterThan_Threshold,BinPrint
 }
+
+compositeAlgorithm Pix_Bins_LessThan_Threshold&BinPrint {
+  libnames = libdqm_algorithms.so
+  subalgs = Bins_LessThan_Threshold,BinPrint
+}
+
 ### For Errors
+
+algorithm Pix_Clusters_Row_LB {
+  name = Pix_Bins_LessThan_Threshold&BinPrint
+  BinThreshold = 2.4
+  thresholds = Pix_Clusters_ColumnRow_LB_Threshold
+  UnMask_All = 10
+  UseValue = 2
+  Value = 0
+}
+
+algorithm Pix_Clusters_Column_LB {
+  name = Pix_Bins_LessThan_Threshold&BinPrint
+  BinThreshold = 1.4
+  thresholds = Pix_Clusters_ColumnRow_LB_Threshold
+  UnMask_All = 10
+  UseValue = 2
+  Value = 0
+}
+
+algorithm Pix_Disabled_Synch_Errors {
+  name = Pix_Bins_GreaterThan_Threshold&BinPrint
+  BinThreshold = 0.1
+  thresholds = Pix_Disabled_Synch_Threshold
+  UnMask_All = 10
+  UseValue = 2
+  Value = 0
+}
+
 algorithm Pix_NonZero_Errors {
   name = Pix_Bins_GreaterThan_Threshold&BinPrint
   BinThreshold = 0
@@ -5127,6 +5724,7 @@ compositeAlgorithm Pix_Bins_Equal_Threshold&BinPrint {
   libnames = libdqm_algorithms.so
   subalgs = Bins_Equal_Threshold,BinPrint
 }
+
 algorithm Pix_Occupancy_Endcap {
   name = Pix_Bins_Equal_Threshold&BinPrint
   BinThreshold = 0
@@ -5344,6 +5942,21 @@ thresholds Pix_NonZero_Errors_Threshold {
     error = 1000
   }
 }
+
+thresholds Pix_Clusters_ColumnRow_LB_Threshold {
+  limits NBins {
+    warning = 1
+    error = 5
+  }
+}
+
+thresholds Pix_Disabled_Synch_Threshold {
+  limits NBins {
+    warning = 1
+    error = 5
+  }
+}
+
 thresholds Pix_ErrorFrac_Threshold {
   limits NBins {
     warning = 0.05
@@ -5356,6 +5969,7 @@ thresholds Pix_DisabledMod_Endcap_Threshold {
     error = 100
   }
 }
+
 thresholds Pix_DisabledMod_B0B1_Threshold {
   limits NBins {
     warning = 15
@@ -5506,3 +6120,4 @@ thresholds Pix_ErrorLB_CheckMean_Thresh {
     error = 10000
   }
 }
+
diff --git a/DataQuality/DataQualityConfigurations/python/TestDisplay.py b/DataQuality/DataQualityConfigurations/python/TestDisplay.py
index 3ab6b1c2052..5a4b73433d4 100644
--- a/DataQuality/DataQualityConfigurations/python/TestDisplay.py
+++ b/DataQuality/DataQualityConfigurations/python/TestDisplay.py
@@ -17,7 +17,7 @@ dqconfig.config         = "TEST"
 #    print "DataQualityConfigurations data directory not found, using $PWD instead."
 #print "Looking for collisions_*.hcfg files in %s" % (hcfg_dir)
 
-hcfg_dir                = '/afs/cern.ch/user/f/fasohns/work/private/dq_level/athena/DataQuality/DataQualityConfigurations/config'
+hcfg_dir                = "/afs/cern.ch/user/f/fasohns/work/private/dq_level/athena/DataQuality/DataQualityConfigurations/config"
 
 dqconfig.hcfg           = "%s/collisions_run.hcfg"       % (hcfg_dir)
 #dqconfig.hcfg_min10     = "%s/collisions_minutes10.hcfg" % (hcfg_dir)
-- 
GitLab