diff --git a/Control/StoreGate/CMakeLists.txt b/Control/StoreGate/CMakeLists.txt
index 0f774c3a3cb863ae411d09b8b64e77c0c4cd3e1f..20e267b4f50ff97cede3bef8207d4c3db93650e1 100644
--- a/Control/StoreGate/CMakeLists.txt
+++ b/Control/StoreGate/CMakeLists.txt
@@ -22,161 +22,60 @@ atlas_add_library( SGtests test/SGtests.cxx
    NO_PUBLIC_HEADERS
    LINK_LIBRARIES CxxUtils StoreGateLib TestTools )
 
-# Declare the package's tests:o
-atlas_add_test( ActiveStore_test
-   SOURCES test/ActiveStore_test.cxx
-   LINK_LIBRARIES SGtests )
+# Declare the package's tests:
+# Helper function setting up the test(s) in the package:
+function( _add_test name )
+   cmake_parse_arguments( ARG "" "LOG_IGNORE_PATTERN" "" ${ARGN} )
+   if( ARG_LOG_IGNORE_PATTERN )
+      set( extra_arg LOG_IGNORE_PATTERN ${ARG_LOG_IGNORE_PATTERN} )
+   endif()
+   atlas_add_test( ${name}
+      SOURCES test/${name}.cxx
+      INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
+      LINK_LIBRARIES StoreGateLib TestTools
+      ${extra_arg} )
+endfunction( _add_test )
+
+set( _hivePatterns "JobOptionsSvc +INFO|StoreGateSvc.*DEBUG|HiveMgrSvc +DEBUG" )
+
+
+_add_test( ActiveStore_test )
+_add_test( SGTiming_test LOG_IGNORE_PATTERN "${_hivePatterns}|rec:|averages" )
+_add_test( SGHive_test LOG_IGNORE_PATTERN "${_hivePatterns}" )
+_add_test( DataHandle_test )
+_add_test( SGIterator_test )
+_add_test( KeyConcept_test )
+_add_test( StoreClearedIncident_test )
+_add_test( SegMemSvc_test )
+_add_test( exceptions_test )
+_add_test( VarHandleKey_parseKey_test )
+_add_test( VarHandleKey_test )
+_add_test( VarHandleKeyProperty_test )
+_add_test( VarHandleProperty_test )
+_add_test( ReadHandleKey_test )
+_add_test( WriteHandleKey_test )
+_add_test( UpdateHandleKey_test )
+_add_test( TypelessWriteHandleKey_test )
+_add_test( VarHandleBase_test )
+_add_test( VarHandles_test )
+_add_test( WriteHandle_test )
+_add_test( ReadHandle_test )
+_add_test( UpdateHandle_test )
+_add_test( TypelessWriteHandle_test )
+_add_test( DecorKeyHelpers_test )
+_add_test( ReadDecorHandleKey_test )
+_add_test( WriteDecorHandleKey_test )
+_add_test( ReadDecorHandle_test )
+_add_test( WriteDecorHandle_test )
+_add_test( CondHandleKeyArray_test )
+_add_test( WriteCondHandle_test )
+_add_test( WriteDecorHandleKeyArray_test )
+_add_test( ReadDecorHandleKeyArray_test )
+_add_test( ThinningHandleKey_test )
+_add_test( ThinningHandleBase_test )
+_add_test( ThinningHandle_test )
+_add_test( ShallowCopyDecorDeps_test )
 
-   set( _hivePatterns "JobOptionsSvc +INFO|StoreGateSvc.*DEBUG|HiveMgrSvc +DEBUG" )
-
-atlas_add_test( SGTiming_test
-   SOURCES test/SGTiming_test.cxx
-   LINK_LIBRARIES SGtests
-   LOG_IGNORE_PATTERN "${_hivePatterns}|rec:|averages" )
-
-atlas_add_test( SGHive_test
-   SOURCES test/SGHive_test.cxx
-   LINK_LIBRARIES SGtests
-   LOG_IGNORE_PATTERN "${_hivePatterns}" )
-
-atlas_add_test( DataHandle_test
-   SOURCES test/DataHandle_test.cxx
-   LINK_LIBRARIES SGtests )
-
-atlas_add_test( SGIterator_test
-   SOURCES test/SGIterator_test.cxx
-   LINK_LIBRARIES SGtests )
-
-atlas_add_test( KeyConcept_test
-   SOURCES test/KeyConcept_test.cxx
-   LINK_LIBRARIES SGtests )
-
-atlas_add_test( StoreClearedIncident_test
-   SOURCES test/StoreClearedIncident_test.cxx
-   LINK_LIBRARIES SGtests )
-
-atlas_add_test( SegMemSvc_test
-   SOURCES test/SegMemSvc_test.cxx
-   LINK_LIBRARIES SGtests )
-
-atlas_add_test( exceptions_test
-   SOURCES test/exceptions_test.cxx
-   LINK_LIBRARIES SGtests )
-
-atlas_add_test( VarHandleKey_parseKey_test
-   SOURCES test/VarHandleKey_parseKey_test.cxx
-   LINK_LIBRARIES SGtests )
-
-atlas_add_test( VarHandleKey_test
-   SOURCES test/VarHandleKey_test.cxx
-   LINK_LIBRARIES SGtests )
-
-atlas_add_test( VarHandleKeyProperty_test
-   SOURCES test/VarHandleKeyProperty_test.cxx
-   LINK_LIBRARIES SGtests )
-
-atlas_add_test( VarHandleProperty_test
-   SOURCES test/VarHandleProperty_test.cxx
-   LINK_LIBRARIES SGtests )
-
-atlas_add_test( ReadHandleKey_test
-   SOURCES test/ReadHandleKey_test.cxx
-   LINK_LIBRARIES SGtests )
-
-atlas_add_test( WriteHandleKey_test
-   SOURCES test/WriteHandleKey_test.cxx
-   LINK_LIBRARIES SGtests )
-
-atlas_add_test( UpdateHandleKey_test
-   SOURCES test/UpdateHandleKey_test.cxx
-   LINK_LIBRARIES SGtests )
-
-atlas_add_test( TypelessWriteHandleKey_test
-   SOURCES test/TypelessWriteHandleKey_test.cxx
-   LINK_LIBRARIES SGtests )
-
-atlas_add_test( VarHandleBase_test
-   SOURCES test/VarHandleBase_test.cxx
-   LINK_LIBRARIES SGtests )
-
-atlas_add_test( VarHandles_test
-   SOURCES test/VarHandles_test.cxx
-   LINK_LIBRARIES SGtests )
-
-atlas_add_test( WriteHandle_test
-   SOURCES test/WriteHandle_test.cxx
-   LINK_LIBRARIES SGtests AthContainers )
-
-atlas_add_test( ReadHandle_test
-   SOURCES test/ReadHandle_test.cxx
-   LINK_LIBRARIES SGtests )
-
-atlas_add_test( UpdateHandle_test
-   SOURCES test/UpdateHandle_test.cxx
-   LINK_LIBRARIES SGtests )
-
-atlas_add_test( TypelessWriteHandle_test
-   SOURCES test/TypelessWriteHandle_test.cxx
-   LINK_LIBRARIES SGtests AthContainers )
-
-atlas_add_test( DecorKeyHelpers_test
-   SOURCES test/DecorKeyHelpers_test.cxx
-   LINK_LIBRARIES StoreGateLib )
-
-atlas_add_test( ReadDecorHandleKey_test
-   SOURCES test/ReadDecorHandleKey_test.cxx
-   INCLUDE_DIRS ${Boost_INCLUDE_DIRS} 
-   LINK_LIBRARIES StoreGateLib TestTools )
-
-atlas_add_test( WriteDecorHandleKey_test
-   SOURCES test/WriteDecorHandleKey_test.cxx
-   INCLUDE_DIRS ${Boost_INCLUDE_DIRS} 
-   LINK_LIBRARIES StoreGateLib TestTools )
-
-atlas_add_test( ReadDecorHandle_test
-   SOURCES test/ReadDecorHandle_test.cxx
-   INCLUDE_DIRS ${Boost_INCLUDE_DIRS} 
-   LINK_LIBRARIES StoreGateLib AthContainers TestTools )
-
-atlas_add_test( WriteDecorHandle_test
-   SOURCES test/WriteDecorHandle_test.cxx
-   INCLUDE_DIRS ${Boost_INCLUDE_DIRS} 
-   LINK_LIBRARIES StoreGateLib AthContainers TestTools )
-
-atlas_add_test( CondHandleKeyArray_test
-   SOURCES test/CondHandleKeyArray_test.cxx
-   INCLUDE_DIRS ${Boost_INCLUDE_DIRS} 
-   LINK_LIBRARIES StoreGateLib AthContainers TestTools )
-
-atlas_add_test( WriteCondHandle_test
-   SOURCES test/WriteCondHandle_test.cxx
-   INCLUDE_DIRS ${Boost_INCLUDE_DIRS} 
-   LINK_LIBRARIES StoreGateLib AthContainers TestTools )
- 
-atlas_add_test( WriteDecorHandleKeyArray_test
-   SOURCES test/WriteDecorHandleKeyArray_test.cxx
-   INCLUDE_DIRS ${Boost_INCLUDE_DIRS} 
-   LINK_LIBRARIES StoreGateLib TestTools )
-
-atlas_add_test( ReadDecorHandleKeyArray_test
-   SOURCES test/ReadDecorHandleKeyArray_test.cxx
-   INCLUDE_DIRS ${Boost_INCLUDE_DIRS} 
-   LINK_LIBRARIES StoreGateLib TestTools )
-
-atlas_add_test( ThinningHandleKey_test
-   SOURCES test/ThinningHandleKey_test.cxx
-   INCLUDE_DIRS ${Boost_INCLUDE_DIRS} 
-   LINK_LIBRARIES StoreGateLib AthContainers TestTools )
-
-atlas_add_test( ThinningHandleBase_test
-   SOURCES test/ThinningHandleBase_test.cxx
-   INCLUDE_DIRS ${Boost_INCLUDE_DIRS} 
-   LINK_LIBRARIES StoreGateLib AthContainers TestTools )
-
-atlas_add_test( ThinningHandle_test
-   SOURCES test/ThinningHandle_test.cxx
-   INCLUDE_DIRS ${Boost_INCLUDE_DIRS} 
-   LINK_LIBRARIES StoreGateLib AthContainers TestTools )
 
 # Install files from the package:
 atlas_install_joboptions( share/*.txt
diff --git a/Control/StoreGate/StoreGate/ShallowCopyDecorDeps.h b/Control/StoreGate/StoreGate/ShallowCopyDecorDeps.h
new file mode 100644
index 0000000000000000000000000000000000000000..3c18fc2528ede1b3e279178773cdf5d0d0e4478c
--- /dev/null
+++ b/Control/StoreGate/StoreGate/ShallowCopyDecorDeps.h
@@ -0,0 +1,129 @@
+// This file's extension implies that it's C, but it's really -*- C++ -*-.
+/*
+ * Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration.
+ */
+/**
+ * @file StoreGate/ShallowCopyDecorDeps.h
+ * @author scott snyder <snyder@bnl.gov>
+ * @date Nov, 2020
+ * @brief Helper to propagate decoration dependencies to a shallow copy.
+ */
+
+
+#ifndef STOREGATE_SHALLOWCOPYDECORDEPS_H
+#define STOREGATE_SHALLOWCOPYDECORDEPS_H
+
+
+#include "StoreGate/ReadHandleKeyArray.h"
+#include "StoreGate/WriteHandleKeyArray.h"
+#include "StoreGate/ReadHandle.h"
+#include "StoreGate/ReadHandleKey.h"
+#include "StoreGate/WriteHandle.h"
+#include "StoreGate/WriteHandleKey.h"
+#include "AthenaKernel/errorcheck.h"
+#include "GaudiKernel/ThreadLocalContext.h"
+
+
+namespace SG {
+
+
+/**
+ * @brief Helper to propagate decoration dependencies to a shallow copy.
+ *
+ * When we do a shallow copy of ORIG to COPY, any decorations of ORIG
+ * are readable via COPY.  However, the scheduler doesn't know about this.
+ * The scheduler keeps track of decoration dependencies via aliases
+ * of the form ORIG.DECOR.  If one tries to use a ReadDecorHandle
+ * for COPY.DECOR, the scheduler won't be able to resolve that dependency
+ * because that alias doesn't exist --- only ORIG.DECOR.
+ *
+ * This class will help in propagating the decoration aliases
+ * from the original object to the shallow copy.  The set of decorations
+ * does need to be specified in advance.
+ *
+ * It is assumed that you have a Gaudi component which does the shallow copy,
+ * and that the original and copy are specified by a ReadHandleKey
+ * and a WriteHandleKey, respectively.
+ *
+ * In the definition of the component class, add a ShallowCopyDecorDeps
+ * member as a property.  The value of the property should be the list
+ * of decorations to be copied:
+ *
+ *@code
+ *  SG::ShallowCopyDecorDeps<MyObj> m_decorDeps
+ *  { this, "DecorDeps", {"decor1", "decor2"},
+ *    "List of decorations to propagate through the shallow copy." };
+ @endcode
+ * 
+ * In the @c initialize() method, call @c initialize on the
+ * ShallowCopyDecorDeps object, passing in the read and write
+ * handle keys for the original object and the shallow copy:
+ *
+ *@code
+ *   ATH_CHECK( m_decorDeps.initialize (m_origKey, m_copyKey) );
+ @endcode
+ *
+ * Finally, after the copy has been recorded, call @c linkDecors,
+ * passing the read handle key for the original object:
+ *
+ *@code
+ *  ATH_CHECK( m_decorDeps.linkDecors (m_origKey, ctx) );
+ @endcode
+ */
+template <class T>
+class ShallowCopyDecorDeps
+{
+public:
+  /** 
+   * @brief Auto-declaring Property constructor.
+   * @param owner Owning component.
+   * @param name Name of the Property.
+   * @param l Default list of decorations to propagate.
+   * @param doc Documentation string.
+   */
+  template <class OWNER>
+  ShallowCopyDecorDeps (OWNER* owner,
+                        const std::string& name,
+                        std::initializer_list<std::string> l,
+                        const std::string& doc = "");
+
+
+  /**
+   * @brief Initialize this property.  Call this from initialize().
+   * @param origKey Key for the source of the shallow copy.
+   * @param copyKey Key for the result of the shallow copy.
+   * @param used If false, then this handle is not to be used.
+   *             Instead of normal initialization, the keys will be cleared.
+   */
+  StatusCode initialize (const SG::ReadHandleKey<T>& origKey,
+                         const SG::WriteHandleKey<T>& copyKey,
+                         bool used = true);
+
+
+  /**
+   * @brief Create alias for the decorations, linked to the shallow copy.
+   * @param origKey Key for the source of the shallow copy.
+   * @param ctx The current EventContext.
+   *
+   * Call this after the shallow copy has been recorded in SG.
+   */
+  StatusCode linkDecors (const SG::ReadHandleKey<T>& origKey,
+                         const EventContext& ctx = Gaudi::Hive::currentContext()) const;
+
+
+private:
+  /// Keys for the decorations on the original object.
+  SG::ReadHandleKeyArray<T> m_readKeys;
+
+  /// Keys for decorations to alias for the shallow copy.
+  SG::WriteHandleKeyArray<T> m_writeKeys;
+};
+
+
+} // namespace SG
+
+
+#include "StoreGate/ShallowCopyDecorDeps.icc"
+
+
+#endif // not STOREGATE_SHALLOWCOPYDECORDEPS_H
diff --git a/Control/StoreGate/StoreGate/ShallowCopyDecorDeps.icc b/Control/StoreGate/StoreGate/ShallowCopyDecorDeps.icc
new file mode 100644
index 0000000000000000000000000000000000000000..8944a4347caef330d6691c4751dafd72e114e387
--- /dev/null
+++ b/Control/StoreGate/StoreGate/ShallowCopyDecorDeps.icc
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration.
+ */
+/**
+ * @file StoreGate/ShallowCopyDecorDeps.icc
+ * @author scott snyder <snyder@bnl.gov>
+ * @date Nov, 2020
+ * @brief Helper to propagate decoration dependencies to a shallow copy.
+ */
+
+
+namespace SG {
+
+
+/** 
+ * @brief Auto-declaring Property constructor.
+ * @param owner Owning component.
+ * @param name Name of the Property.
+ * @param l Default list of decorations to propagate.
+ * @param doc Documentation string.
+ */
+template <class T>
+template <class OWNER>
+ShallowCopyDecorDeps<T>::ShallowCopyDecorDeps (OWNER* owner,
+                                               const std::string& name,
+                                               std::initializer_list<std::string> l,
+                                               const std::string& doc /*= ""*/)
+  : m_readKeys (owner, name + "ReadKeys", {}, "[Internal property]"),
+    m_writeKeys (owner, name, l, doc)
+{
+}
+
+
+/**
+ * @brief Initialize this property.  Call this from initialize().
+ * @param origKey Key for the source of the shallow copy.
+ * @param copyKey Key for the result of the shallow copy.
+ * @param used If false, then this handle is not to be used.
+ *             Instead of normal initialization, the keys will be cleared.
+ */
+template <class T>
+StatusCode
+ShallowCopyDecorDeps<T>::initialize (const SG::ReadHandleKey<T>& origKey,
+                                     const SG::WriteHandleKey<T>& copyKey,
+                                     bool used /*= true*/)
+{
+  m_readKeys.clear();
+  if (used) {
+    for (SG::WriteHandleKey<T>& k : m_writeKeys) {
+      m_readKeys.emplace_back (origKey.key() + "." + k.key());
+      k = copyKey.key() + "." + k.key();
+    }
+    CHECK( m_readKeys.initialize() );
+    CHECK( m_writeKeys.initialize() );
+  }
+  else {
+    m_writeKeys.clear();
+  }
+  return StatusCode::SUCCESS;
+}
+
+
+/**
+ * @brief Create alias for the decorations, linked to the shallow copy.
+ * @param origKey Key for the source of the shallow copy.
+ * @param ctx The current EventContext.
+ *
+ * Call this after the shallow copy has been recorded in SG.
+ */
+template <class T>
+StatusCode
+ShallowCopyDecorDeps<T>::linkDecors (const SG::ReadHandleKey<T>& origKey,
+                                     const EventContext& ctx /*= Gaudi::Hive::currentContext()*/) const
+{
+  SG::ReadHandle<T> orig (origKey, ctx);
+  for (const SG::WriteHandleKey<T>& k : m_writeKeys) {
+    CHECK( orig.alias (k) );
+  }
+  return StatusCode::SUCCESS;
+}
+
+
+} // namespace SG
diff --git a/Control/StoreGate/share/ShallowCopyDecorDeps_test.ref b/Control/StoreGate/share/ShallowCopyDecorDeps_test.ref
new file mode 100644
index 0000000000000000000000000000000000000000..0c5e0952444d59bdea5ae672068422e9c0c71d7e
--- /dev/null
+++ b/Control/StoreGate/share/ShallowCopyDecorDeps_test.ref
@@ -0,0 +1,12 @@
+StoreGate/ShallowCopyDecorDeps_test
+ApplicationMgr    SUCCESS 
+====================================================================================================================================
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v27r1p99)
+                                          running on karma on Wed Nov 25 15:44:43 2020
+====================================================================================================================================
+ApplicationMgr       INFO Application Manager Configured successfully
+EventLoopMgr      WARNING Unable to locate service "EventSelector" 
+EventLoopMgr      WARNING No events will be processed from external input.
+ApplicationMgr       INFO Application Manager Initialized successfully
+ApplicationMgr Ready
+test1
diff --git a/Control/StoreGate/test/ShallowCopyDecorDeps_test.cxx b/Control/StoreGate/test/ShallowCopyDecorDeps_test.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..20d0a9181a28dffb3c676c08ecedcc2810c48e89
--- /dev/null
+++ b/Control/StoreGate/test/ShallowCopyDecorDeps_test.cxx
@@ -0,0 +1,87 @@
+/*
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+/**
+ * @file StoreGate/test/ShallowCopyDecorDeps_test.cxx
+ * @author scott snyder <snyder@bnl.gov>
+ * @date Nov, 2020
+ * @brief Tests for ShallowCopyDecorDeps.
+ */
+
+
+#undef NDEBUG
+#include "StoreGate/ShallowCopyDecorDeps.h"
+#include "StoreGate/StoreGateSvc.h"
+#include "SGTools/TestStore.h"
+#include "AthenaKernel/ExtendedEventContext.h"
+#include "AthenaKernel/CLASS_DEF.h"
+#include "TestTools/initGaudi.h"
+#include "TestOwner.h"
+#include <cassert>
+#include <iostream>
+
+
+class MyObj {};
+CLASS_DEF (MyObj, 293847295, 1)
+
+
+void test1 (ISvcLocator* svcloc)
+{
+  std::cout << "test1\n";
+
+  TestOwner owner;
+  SG::ShallowCopyDecorDeps<MyObj> scdd (&owner, "SCDD", {"d1", "d2"}, "doc string");
+  SG::ReadHandleKey<MyObj> origKey (&owner, "ReadKey", "myObj");
+  SG::WriteHandleKey<MyObj> copyKey (&owner, "WriteKey", "scopy_myObj");
+
+  assert( origKey.initialize().isSuccess() );
+  assert( copyKey.initialize().isSuccess() );
+  assert( scdd.initialize (origKey, copyKey) );
+
+  assert (owner.getProperty ("SCDD").name() == "SCDD");
+  assert (owner.getProperty ("SCDD").documentation() == "doc string");
+  assert (owner.getProperty ("SCDD").type_info() == &typeid(SG::VarHandleKeyArray));
+  assert (owner.getProperty ("SCDD").toString() == "['StoreGateSvc+scopy_myObj.d1','StoreGateSvc+scopy_myObj.d2']");
+  assert (owner.getProperty ("SCDD").ownerTypeName() == "TestOwner");
+
+  assert (owner.getProperty ("SCDDReadKeys").name() == "SCDDReadKeys");
+  assert (owner.getProperty ("SCDDReadKeys").documentation() == "[Internal property]");
+  assert (owner.getProperty ("SCDDReadKeys").type_info() == &typeid(SG::VarHandleKeyArray));
+  assert (owner.getProperty ("SCDDReadKeys").toString() == "['StoreGateSvc+myObj.d1','StoreGateSvc+myObj.d2']");
+  assert (owner.getProperty ("SCDDReadKeys").ownerTypeName() == "TestOwner");
+
+  StoreGateSvc* sg = nullptr;
+  assert (svcloc->service ("StoreGateSvc", sg).isSuccess());
+  assert (sg->record (std::make_unique<MyObj>(), "myObj", false).isSuccess());
+
+  EventContext ctx;
+  ctx.setExtension( Atlas::ExtendedEventContext(sg) );
+
+  assert( scdd.linkDecors (origKey, ctx).isSuccess() );
+
+  const MyObj* myObj = nullptr;
+  assert (sg->retrieve (myObj, "myObj").isSuccess());
+  assert (myObj != nullptr);
+
+  const MyObj* myObj2 = nullptr;
+  assert (sg->retrieve (myObj2, "scopy_myObj.d1").isSuccess());
+  assert (myObj == myObj2);
+
+  myObj2 = nullptr;
+  assert (sg->retrieve (myObj2, "scopy_myObj.d2").isSuccess());
+  assert (myObj == myObj2);
+}
+
+
+int main()
+{
+  std::cout << "StoreGate/ShallowCopyDecorDeps_test\n";
+
+  ISvcLocator* svcloc = nullptr;
+  if (!Athena_test::initGaudi("StoreGate/VarHandleBase_test.txt", svcloc)) {
+    return 1;
+  }
+
+  test1 (svcloc);
+  return 0;
+}
diff --git a/Control/StoreGate/test/TestOwner.h b/Control/StoreGate/test/TestOwner.h
index e289c93db20b7a0b65f775f702b0f5d8551bc18e..cab216579942ca9a82745847e5ee10c14bd2a621 100644
--- a/Control/StoreGate/test/TestOwner.h
+++ b/Control/StoreGate/test/TestOwner.h
@@ -1,6 +1,6 @@
 // This file's extension implies that it's C, but it's really -*- C++ -*-.
 /*
-   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+   Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
  */
 /**
  * @file StoreGate/test/TestOwner.h
@@ -18,6 +18,7 @@
 
 
 #include "StoreGate/VarHandleKeyProperty.h"
+#include "StoreGate/VarHandleKeyArrayProperty.h"
 #include "GaudiKernel/PropertyHolder.h"
 #include "GaudiKernel/IProperty.h"
 
diff --git a/DataQuality/DataQualityConfigurations/config/Pixel/collisions_run.config b/DataQuality/DataQualityConfigurations/config/Pixel/collisions_run.config
index 6b48ce1db823ca01c0fe18ea242d6059679dd1c0..48af7b739110b372ef79ca22f4a808e7f7303399 100644
--- a/DataQuality/DataQualityConfigurations/config/Pixel/collisions_run.config
+++ b/DataQuality/DataQualityConfigurations/config/Pixel/collisions_run.config
@@ -1170,12 +1170,321 @@ dir Pixel {
 
   dir Errors {
 
+    hist OpticalErrors_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist OpticalErrors_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist OpticalErrors_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist OpticalErrors_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist OpticalErrors_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist OpticalErrors_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SyncErrors_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SyncErrors_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SyncErrors_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SyncErrors_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SyncErrors_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SyncErrors_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SyncErrorsMod_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    } 
+    hist SyncErrorsMod_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SyncErrorsMod_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SyncErrorsMod_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SyncErrorsMod_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SyncErrorsMod_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SyncErrorsROD_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SyncErrorsROD_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SyncErrorsROD_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SyncErrorsROD_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SyncErrorsROD_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SyncErrorsROD_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist TimeoutErrors_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist TimeoutErrors_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist TimeoutErrors_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist TimeoutErrors_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist TimeoutErrors_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist TimeoutErrors_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist FEMCCErrorwords_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist FEMCCErrorwords_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist FEMCCErrorwords_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist FEMCCErrorwords_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist FEMCCErrorwords_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist FEMCCErrorwords_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SEUErrors_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SEUErrors_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SEUErrors_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SEUErrors_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SEUErrors_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SEUErrors_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+   
+    hist TruncErrors_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    } 
+    hist TruncErrors_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist TruncErrors_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist TruncErrors_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist TruncErrors_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist TruncErrors_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist TruncErrorsMod_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    } 
+    hist TruncErrorsMod_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    } 
+    hist TruncErrorMod_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist TruncErrorsMod_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist TruncErrorsMod_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist TruncErrorsMod_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist TruncErrorsROD_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist TruncErrorsROD_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist TruncErrorROD_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist TruncErrorsROD_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist TruncErrorsROD_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist TruncErrorsROD_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
     hist SyncErrorsFracPerEvent_IBL {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIXIBL/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-
     hist SyncErrorsFracPerEvent_B0 {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIX0/DisableAndErrorsLB
@@ -1202,102 +1511,133 @@ dir Pixel {
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
 
-    hist SyncErrorsRODFracPerEvent_IBL {
+    hist SyncErrorsModFracPerEvent_IBL {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIXIBL/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist SyncErrorsRODFracPerEvent_B0 {
+    hist SyncErrorsModFracPerEvent_B0 {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIX0/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist SyncErrorsRODFracPerEvent_B1 {
+    hist SyncErrorsModFracPerEvent_B1 {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIX1/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist SyncErrorsRODFracPerEvent_B2 {
+    hist SyncErrorsModFracPerEvent_B2 {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIX2/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist SyncErrorsRODFracPerEvent_ECA {
+    hist SyncErrorsModFracPerEvent_ECA {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIXECA/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist SyncErrorsRODFracPerEvent_ECC {
+    hist SyncErrorsModFracPerEvent_ECC {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIXECC/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
-    }
+    } 
 
-    hist ErrorStatePerLumi_IBL {
+    hist SyncErrorsRODFracPerEvent_IBL {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIXIBL/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist ErrorStatePerLumi_B0 {
+    hist SyncErrorsRODFracPerEvent_B0 {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIX0/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist ErrorStatePerLumi_B1 {
+    hist SyncErrorsRODFracPerEvent_B1 {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIX1/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist ErrorStatePerLumi_B2 {
+    hist SyncErrorsRODFracPerEvent_B2 {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIX2/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist ErrorStatePerLumi_ECA {
+    hist SyncErrorsRODFracPerEvent_ECA {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIXECA/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist ErrorStatePerLumi_ECC {
+    hist SyncErrorsRODFracPerEvent_ECC {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIXECC/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
 
+    #hist ErrorStatePerLumi_IBL {
+    #  algorithm = Pix_NonZero_Errors
+    #  output = InnerDetector/Pixel/PIXIBL/DisableAndErrorsLB
+    #  description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
+    #}
+    #hist ErrorStatePerLumi_B0 {
+    #  algorithm = Pix_NonZero_Errors
+    #  output = InnerDetector/Pixel/PIX0/DisableAndErrorsLB
+    #  description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
+    #}
+    #hist ErrorStatePerLumi_B1 {
+    #  algorithm = Pix_NonZero_Errors
+    #  output = InnerDetector/Pixel/PIX1/DisableAndErrorsLB
+    #  description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
+    #}
+    #hist ErrorStatePerLumi_B2 {
+    #  algorithm = Pix_NonZero_Errors
+    #  output = InnerDetector/Pixel/PIX2/DisableAndErrorsLB
+    #  description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
+    #}
+    #hist ErrorStatePerLumi_ECA {
+    #  algorithm = Pix_NonZero_Errors
+    #  output = InnerDetector/Pixel/PIXECA/DisableAndErrorsLB
+    #  description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
+    #}
+    #hist ErrorStatePerLumi_ECC {
+    #  algorithm = Pix_NonZero_Errors
+    #  output = InnerDetector/Pixel/PIXECC/DisableAndErrorsLB
+    #  description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
+    #}
+
     hist SEUErrorsFracPerEvent_IBL {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
-      output = InnerDetector/Pixel/PIXIBL/DisableAndErrorsLB
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
     hist SEUErrorsFracPerEvent_B0 {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
-      output = InnerDetector/Pixel/PIX0/DisableAndErrorsLB
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
     hist SEUErrorsFracPerEvent_B1 {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
-      output = InnerDetector/Pixel/PIX1/DisableAndErrorsLB
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
     hist SEUErrorsFracPerEvent_B2 {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
-      output = InnerDetector/Pixel/PIX2/DisableAndErrorsLB
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
     hist SEUErrorsFracPerEvent_ECA {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
-      output = InnerDetector/Pixel/PIXECA/DisableAndErrorsLB
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
     hist SEUErrorsFracPerEvent_ECC {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
-      output = InnerDetector/Pixel/PIXECC/DisableAndErrorsLB
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
 
@@ -1376,41 +1716,99 @@ dir Pixel {
     }
 
     hist TruncationErrorsFracPerEvent_IBL {
-      #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
-      output = InnerDetector/Pixel/PIXIBL/DisableAndErrorsLB
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
     hist TruncationErrorsFracPerEvent_B0 {
-      #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
-      output = InnerDetector/Pixel/PIX0/DisableAndErrorsLB
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
     hist TruncationErrorsFracPerEvent_B1 {
-      #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
-      output = InnerDetector/Pixel/PIX1/DisableAndErrorsLB
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
     hist TruncationErrorsFracPerEvent_B2 {
-      #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
-      output = InnerDetector/Pixel/PIX2/DisableAndErrorsLB
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
     hist TruncationErrorsFracPerEvent_ECA {
-      #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
-      output = InnerDetector/Pixel/PIXECA/DisableAndErrorsLB
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
     hist TruncationErrorsFracPerEvent_ECC {
-      #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
-      output = InnerDetector/Pixel/PIXECC/DisableAndErrorsLB
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
+    }
+
+    hist TruncErrorsModFracPerEvent_IBL {
+      algorithm = Pix_Frac_Errors
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
+    }
+    hist TruncErrorsModFracPerEvent_B0 {
+      algorithm = Pix_Frac_Errors
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
+    }
+    hist TruncErrorsModFracPerEvent_B1 {
+      algorithm = Pix_Frac_Errors
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
+    }
+    hist TruncErrorsModFracPerEvent_B2 {
+      algorithm = Pix_Frac_Errors
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
+    }
+    hist TruncErrorsModFracPerEvent_ECA {
+      algorithm = Pix_Frac_Errors
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
+    }
+    hist TruncErrorsModFracPerEvent_ECC {
+      algorithm = Pix_Frac_Errors
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
+    } 
+   
+    hist TruncErrorsRODFracPerEvent_IBL {
+      algorithm = Pix_Frac_Errors
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
+    }
+    hist TruncErrorsRODFracPerEvent_B0 {
+      algorithm = Pix_Frac_Errors
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
+    }
+    hist TruncErrorsRODFracPerEvent_B1 {
+      algorithm = Pix_Frac_Errors
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
+    }
+    hist TruncErrorsRODFracPerEvent_B2 {
+      algorithm = Pix_Frac_Errors
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
+    }
+    hist TruncErrorsRODFracPerEvent_ECA {
+      algorithm = Pix_Frac_Errors
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
+    }
+    hist TruncErrorsRODFracPerEvent_ECC {
+      algorithm = Pix_Frac_Errors
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
+ 
+  
 
     ######################################
     hist SyncErrorsFracPerEvent_IBL {
@@ -1484,347 +1882,2645 @@ dir Pixel {
 
   dir ErrorsExpert {
 
-    #hist FE_Warning_per_lumi_PIX {
-    #  algorithm = Plain_GatherData
-    #  output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/FE_Warning
-    #}
-    hist FEWarningPerLumi_ECA {
+    hist ServiceRecordUnweighted_IBL {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/FE_Warning
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist FEWarningPerLumi_ECC {
+    hist ServiceRecordUnweighted_B0 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/FE_Warning
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist FEWarningPerLumi_B0 {
+    hist ServiceRecordUnweighted_B1 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/FE_Warning
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist FEWarningPerLumi_B1 {
+    hist ServiceRecordUnweighted_B2 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/FE_Warning
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist FEWarningPerLumi_B2 {
+    hist ServiceRecordUnweighted_ECA {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/FE_Warning
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-
-    hist ModSyncBCID1ErrorsPerLumi_ECA {
+    hist ServiceRecordUnweighted_ECC {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_BCID1
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist ModSyncBCID1ErrorsPerLumi_ECC {
+
+    hist ServiceRecordWeighted_IBL {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_BCID1
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist ModSyncBCID1ErrorsPerLumi_B0 {
+    hist ServiceRecordWeighted_B0 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_BCID1
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist ModSyncBCID1ErrorsPerLumi_B1 {
+    hist ServiceRecordWeighted_B1 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_BCID1
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist ModSyncBCID1ErrorsPerLumi_B2 {
+    hist ServiceRecordWeighted_B2 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_BCID1
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-
-    hist ModSyncBCID2ErrorsPerLumi_B0 {
+    hist ServiceRecordWeighted_ECA {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_BCID2
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist ModSyncBCID2ErrorsPerLumi_B1 {
+    hist ServiceRecordWeighted_ECC {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_BCID2
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist ModSyncBCID2ErrorsPerLumi_B2 {
+
+    hist FEWarningMap_IBL {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_BCID2
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist ModSyncBCID2ErrorsPerLumi_ECA {
+    hist FEWarningMap_B0 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_BCID2
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist ModSyncBCID2ErrorsPerLumi_ECC {
+    hist FEWarningMap_B1 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_BCID2
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-
-    hist ModSyncLVL1IDErrorsPerLumi_B0 {
+    hist FEWarningMap_B2 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_LVL1ID
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist ModSyncLVL1IDErrorsPerLumi_B1 {
+    hist FEWarningMap_ECA {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_LVL1ID
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist ModSyncLVL1IDErrorsPerLumi_B2 {
+    hist FEWarningMap_ECC {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_LVL1ID
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist ModSyncLVL1IDErrorsPerLumi_ECA {
+
+    hist ModSyncBCID1ErrorsMap_IBL {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_LVL1ID
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist ModSyncLVL1IDErrorsPerLumi_ECC {
+    hist ModSyncBCID1ErrorsMap_B0 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_LVL1ID
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-
-    hist ModTruncEOCErrorsPerLumi_ECA {
+    hist ModSyncBCID1ErrorsMap_B1 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_EoC
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist ModTruncEOCErrorsPerLumi_ECC {
+    hist ModSyncBCID1ErrorsMap_B2 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_EoC
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist ModTruncEOCErrorsPerLumi_B0 {
+    hist ModSyncBCID1ErrorsMap_ECA {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_EoC
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist ModTruncEOCErrorsPerLumi_B1 {
+    hist ModSyncBCID1ErrorsMap_ECC {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_EoC
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist ModTruncEOCErrorsPerLumi_B2 {
+
+    hist ModSyncBCID2ErrorsMap_IBL {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_EoC
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-
-    hist ModTruncEoEOverflowErrorsPerLumi_B0 {
+    hist ModSyncBCID2ErrorsMap_B0 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_EoE_Overflow
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist ModTruncEoEOverflowErrorsPerLumi_B1 {
+    hist ModSyncBCID2ErrorsMap_B1 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_EoE_Overflow
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist ModTruncEoEOverflowErrorsPerLumi_B2 {
+    hist ModSyncBCID2ErrorsMap_B2 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_EoE_Overflow
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist ModTruncEoEOverflowErrorsPerLumi_ECA {
+    hist ModSyncBCID2ErrorsMap_ECA {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_EoE_Overflow
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist ModTruncEoEOverflowErrorsPerLumi_ECC {
+    hist ModSyncBCID2ErrorsMap_ECC {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_EoE_Overflow
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
 
-    hist ModTruncHitOverflowErrorsPerLumi_B0 {
+    hist ModSyncLVL1IDErrorsMap_IBL {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_Hit_Overflow
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist ModTruncHitOverflowErrorsPerLumi_B1 {
+    hist ModSyncLVL1IDErrorsMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist ModSyncLVL1IDErrorsMap_B1 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_Hit_Overflow
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist ModTruncHitOverflowErrorsPerLumi_B2 {
+    hist ModSyncLVL1IDErrorsMap_B2 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_Hit_Overflow
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist ModTruncHitOverflowErrorsPerLumi_ECA {
+    hist ModSyncLVL1IDErrorsMap_ECA {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_Hit_Overflow
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist ModTruncHitOverflowErrorsPerLumi_ECC {
+    hist ModSyncLVL1IDErrorsMap_ECC {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_Hit_Overflow
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
 
-    hist OpticalErrorsPerLumi_B0 {
+    hist ModTruncEOCErrorsMap_IBL {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Optical_Errors
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist OpticalErrorsPerLumi_B1 {
+    hist ModTruncEOCErrorsMap_B0 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Optical_Errors
-    }
-    hist OpticalErrorsPerLumi_B2 {
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    } 
+    hist ModTruncEOCErrorsMap_B1 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Optical_Errors
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    } 
+    hist ModTruncEOCErrorsMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist OpticalErrorsPerLumi_ECA {
+    hist ModTruncEOCErrorsMap_ECA {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Optical_Errors
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist OpticalErrorsPerLumi_ECC {
+    hist ModTruncEOCErrorsMap_ECC {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Optical_Errors
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
 
-    hist RODSyncBCIDErrorsPerLumi_B0 {
+   hist ModTruncEoEOverflowErrorsMap_IBL { 
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_ROD_BCID
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist RODSyncBCIDErrorsPerLumi_B1 {
+    hist ModTruncEoEOverflowErrorsMap_B0 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_ROD_BCID
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist RODSyncBCIDErrorsPerLumi_B2 {
+    hist ModTruncEoEOverflowErrorsMap_B1 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_ROD_BCID
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist RODSyncBCIDErrorsPerLumi_ECA {
+    hist ModTruncEoEOverflowErrorsMap_B2 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_ROD_BCID
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist RODSyncBCIDErrorsPerLumi_ECC {
+    hist ModTruncEoEOverflowErrorsMap_ECA {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_ROD_BCID
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
+    hist ModTruncEoEOverflowErrorsMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    } 
 
-    hist RODSyncLVL1IDErrorsPerLumi_B0 {
+    hist ModTruncHitOverflowErrorsMap_IBL {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_ROD_LVL1ID
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist RODSyncLVL1IDErrorsPerLumi_B1 {
+    hist ModTruncHitOverflowErrorsMap_B0 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_ROD_LVL1ID
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist RODSyncLVL1IDErrorsPerLumi_B2 {
+    hist ModTruncHitOverflowErrorsMap_B1 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_ROD_LVL1ID
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist RODSyncLVL1IDErrorsPerLumi_ECA {
+    hist ModTruncHitOverflowErrorsMap_B2 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_ROD_LVL1ID
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist RODSyncLVL1IDErrorsPerLumi_ECC {
+    hist ModTruncHitOverflowErrorsMap_ECA {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_ROD_LVL1ID
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-
-    hist RODTimeoutPerLumi_B0 {
+    hist ModTruncHitOverflowErrorsMap_ECC {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/ROD_Timeout
-    }
-    hist RODTimeoutPerLumi_B1 {
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }    
+
+    hist OpticalErrorsMap_IBL {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/ROD_Timeout
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist RODTimeoutPerLumi_B2 {
+    hist OpticalErrorsMap_B0 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/ROD_Timeout
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist RODTimeoutPerLumi_ECA {
+    hist OpticalErrorsMap_B1 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/ROD_Timeout
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist RODTimeoutPerLumi_ECC {
+    hist OpticalErrorsMap_B2 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/ROD_Timeout
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-
-    hist RODTruncHTLimitErrorsPerLumi_B0 {
+    hist OpticalErrorsMap_ECA {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_ROD_HT_Limit
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist RODTruncHTLimitErrorsPerLumi_B1 {
+    hist OpticalErrorsMap_ECC {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_ROD_HT_Limit
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist RODTruncHTLimitErrorsPerLumi_B2 {
+ 
+    hist RODBCIDErrorsMap_IBL {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_ROD_HT_Limit
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist RODTruncHTLimitErrorsPerLumi_ECA {
+    hist RODBCIDErrorsMap_B0 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_ROD_HT_Limit
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist RODTruncHTLimitErrorsPerLumi_ECC {
+    hist RODBCIDErrorsMap_B1 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_ROD_HT_Limit
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-
-    hist RODTruncRODOFErrorsPerLumi_B0 {
+    hist RODBCIDErrorsMap_B2 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_ROD_FIFO_Overflow
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist RODTruncRODOFErrorsPerLumi_B1 {
+    hist RODBCIDErrorsMap_ECA {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_ROD_FIFO_Overflow
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist RODTruncRODOFErrorsPerLumi_B2 {
+    hist RODBCIDErrorsMap_ECC {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_ROD_FIFO_Overflow
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist RODTruncRODOFErrorsPerLumi_ECA {
+
+    hist RODLVL1IDErrorsMap_IBL {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_ROD_FIFO_Overflow
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist RODTruncRODOFErrorsPerLumi_ECC {
+    hist RODLVL1IDErrorsMap_B0 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_ROD_FIFO_Overflow
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-
-
-    hist SEUHammingPerLumi_ECA {
+    hist RODLVL1IDErrorsMap_B1 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Hamming
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist SEUHammingPerLumi_ECC {
+    hist RODLVL1IDErrorsMap_B2 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Hamming
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist SEUHammingPerLumi_B0 {
+    hist RODLVL1IDErrorsMap_ECA {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Hamming
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist SEUHammingPerLumi_B1 {
+    hist RODLVL1IDErrorsMap_ECC {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Hamming
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist SEUHammingPerLumi_B2 {
+
+    hist RODLimitErrorsMap_IBL {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Hamming
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-
-    hist SEUHitParityPerLumi_ECA {
+    hist RODLimitErrorsMap_B0 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Hit_Parity
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist SEUHitParityPerLumi_ECC {
+    hist RODLimitErrorsMap_B1 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Hit_Parity
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist SEUHitParityPerLumi_B0 {
+    hist RODLimitErrorsMap_B2 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Hit_Parity
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist SEUHitParityPerLumi_B1 {
+    hist RODLimitErrorsMap_ECA {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Hit_Parity
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist SEUHitParityPerLumi_B2 {
+    hist RODLimitErrorsMap_ECC {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Hit_Parity
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
 
-    hist SEURegisterParityPerLumi_ECA {
+    hist RODPreambleErrorsMap_IBL {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Register_Parity
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist SEURegisterParityPerLumi_ECC {
+    hist RODPreambleErrorsMap_B0 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Register_Parity
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODPreambleErrorsMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODPreambleErrorsMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODPreambleErrorsMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODPreambleErrorsMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    
+    hist RODRowColumnErrorsMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODRowColumnErrorsMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODRowColumnErrorsMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODRowColumnErrorsMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODRowColumnErrorsMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODRowColumnErrorsMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    
+    hist RODSyncBCIDErrorsMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODSyncBCIDErrorsMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODSyncBCIDErrorsMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODSyncBCIDErrorsMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODSyncBCIDErrorsMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODSyncBCIDErrorsMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    } 
+
+    hist RODSyncLVL1IDErrorsMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODSyncLVL1IDErrorsMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODSyncLVL1IDErrorsMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODSyncLVL1IDErrorsMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODSyncLVL1IDErrorsMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODSyncLVL1IDErrorsMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist RODTimeoutMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTimeoutMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTimeoutMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTimeoutMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTimeoutMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTimeoutMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist RODTimeoutErrorsMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTimeoutErrorsMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTimeoutErrorsMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTimeoutErrorsMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTimeoutErrorsMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTimeoutErrorsMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist RODTrailerBitErrorsMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTrailerBitErrorsMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTrailerBitErrorsMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTrailerBitErrorsMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTrailerBitErrorsMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTrailerBitErrorsMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    
+    hist RODTrailerErrorsMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTrailerErrorsMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTrailerErrorsMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTrailerErrorsMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTrailerErrorsMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTrailerErrorsMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+ 
+    hist RODTruncHTLimitErrorsMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTruncHTLimitErrorsMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTruncHTLimitErrorsMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTruncHTLimitErrorsMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTruncHTLimitErrorsMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTruncHTLimitErrorsMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist RODTruncRODOFErrorsMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTruncRODOFErrorsMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTruncRODOFErrorsMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTruncRODOFErrorsMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTruncRODOFErrorsMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTruncRODOFErrorsMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SEUHammingMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SEUHammingMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SEUHammingMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SEUHammingMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SEUHammingMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SEUHammingMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+   
+    hist SEUHitParityMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SEUHitParityMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SEUHitParityMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SEUHitParityMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SEUHitParityMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SEUHitParityMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+  
+    hist SEURegisterParityMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SEURegisterParityMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SEURegisterParityMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SEURegisterParityMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SEURegisterParityMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SEURegisterParityMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR0BCIDCounterErrorsMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR0BCIDCounterErrorsMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR0BCIDCounterErrorsMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR0BCIDCounterErrorsMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR0BCIDCounterErrorsMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR0BCIDCounterErrorsMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR1HammingCode0ErrorsMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR1HammingCode0ErrorsMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR1HammingCode0ErrorsMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR1HammingCode0ErrorsMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR1HammingCode0ErrorsMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR1HammingCode0ErrorsMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    } 
+
+    hist SR2HammingCode1ErrorsMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR2HammingCode1ErrorsMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR2HammingCode1ErrorsMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR2HammingCode1ErrorsMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR2HammingCode1ErrorsMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR2HammingCode1ErrorsMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR3HammingCode2ErrorsMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR3HammingCode2ErrorsMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR3HammingCode2ErrorsMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR3HammingCode2ErrorsMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR3HammingCode2ErrorsMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR3HammingCode2ErrorsMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR4L1InCounterErrorsMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR4L1InCounterErrorsMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR4L1InCounterErrorsMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR4L1InCounterErrorsMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR4L1InCounterErrorsMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR4L1InCounterErrorsMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR5L1RequestCounterErrorsMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR5L1RequestCounterErrorsMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR5L1RequestCounterErrorsMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR5L1RequestCounterErrorsMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR5L1RequestCounterErrorsMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR5L1RequestCounterErrorsMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR6L1RegisterErrorsMap_IBL { 
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR6L1RegisterErrorsMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR6L1RegisterErrorsMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR6L1RegisterErrorsMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR6L1RegisterErrorsMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR6L1RegisterErrorsMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR7L1TriggerIDErrorsMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR7L1TriggerIDErrorsMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR7L1TriggerIDErrorsMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR7L1TriggerIDErrorsMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR7L1TriggerIDErrorsMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR7L1TriggerIDErrorsMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR8FEReadoutProcessErrorsMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR8FEReadoutProcessErrorsMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR8FEReadoutProcessErrorsMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR8FEReadoutProcessErrorsMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR8FEReadoutProcessErrorsMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR8FEReadoutProcessErrorsMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR15SkipppedTrigCountErrorsMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR15SkipppedTrigCountErrorsMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR15SkipppedTrigCountErrorsMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR15SkipppedTrigCountErrorsMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR15SkipppedTrigCountErrorsMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR15SkipppedTrigCountErrorsMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+ 
+    hist SR16TruncatedEventFlagErrorsMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR16TruncatedEventFlagErrorsMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR16TruncatedEventFlagErrorsMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR16TruncatedEventFlagErrorsMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR16TruncatedEventFlagErrorsMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR16TruncatedEventFlagErrorsMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR24TripleRedundantErrorsCNFGMEMMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR24TripleRedundantErrorsCNFGMEMMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR24TripleRedundantErrorsCNFGMEMMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR24TripleRedundantErrorsCNFGMEMMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR24TripleRedundantErrorsCNFGMEMMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR24TripleRedundantErrorsCNFGMEMMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR25WriteRegDataErrorsMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR25WriteRegDataErrorsMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR25WriteRegDataErrorsMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR25WriteRegDataErrorsMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR25WriteRegDataErrorsMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR25WriteRegDataErrorsMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR26AddressErrorsMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR26AddressErrorsMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR26AddressErrorsMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR26AddressErrorsMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR26AddressErrorsMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR26AddressErrorsMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR27OtherCMDDecoderErrorsMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR27OtherCMDDecoderErrorsMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR27OtherCMDDecoderErrorsMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR27OtherCMDDecoderErrorsMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR27OtherCMDDecoderErrorsMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR27OtherCMDDecoderErrorsMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR28CMDDecoderBitflipErrorsMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR28CMDDecoderBitflipErrorsMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR28CMDDecoderBitflipErrorsMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR28CMDDecoderBitflipErrorsMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR28CMDDecoderBitflipErrorsMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR28CMDDecoderBitflipErrorsMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR29TripleRedundantErrorsMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR29TripleRedundantErrorsMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR29TripleRedundantErrorsMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR29TripleRedundantErrorsMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR29TripleRedundantErrorsMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR29TripleRedundantErrorsMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR30DataBusAddressErrorsMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR30DataBusAddressErrorsMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR30DataBusAddressErrorsMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR30DataBusAddressErrorsMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR30DataBusAddressErrorsMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR30DataBusAddressErrorsMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR31TripleRedundantErrorsEFUSEMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR31TripleRedundantErrorsEFUSEMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR31TripleRedundantErrorsEFUSEMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR31TripleRedundantErrorsEFUSEMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR31TripleRedundantErrorsEFUSEMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR31TripleRedundantErrorsEFUSEMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+  
+    #hist FE_Warning_per_lumi_PIX {
+    #  algorithm = Plain_GatherData
+    #  output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/FE_Warning
+    #}
+    hist FEWarningPerLumi_ECA {
+      algorithm = Plain_GatherData
+      #output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/FE_Warning
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+    }
+    hist FEWarningPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+    }
+    hist FEWarningPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+    }
+    hist FEWarningPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+    }
+    hist FEWarningPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+    }
+    hist FEWarningPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+    }
+  
+
+    hist ModSyncBCID1ErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+    }
+    hist ModSyncBCID1ErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+    }
+    hist ModSyncBCID1ErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+    }
+    hist ModSyncBCID1ErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+    }
+    hist ModSyncBCID1ErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+    }
+    hist ModSyncBCID1ErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+    }
+
+    hist ModSyncBCID2ErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+    }
+    hist ModSyncBCID2ErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+    }
+    hist ModSyncBCID2ErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+    }
+    hist ModSyncBCID2ErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+    }
+    hist ModSyncBCID2ErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+    }
+    hist ModSyncBCID2ErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+    }
+
+    hist ModSyncLVL1IDErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+    }
+    hist ModSyncLVL1IDErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+    }
+    hist ModSyncLVL1IDErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+    }
+    hist ModSyncLVL1IDErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+    }
+    hist ModSyncLVL1IDErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+    }
+    hist ModSyncLVL1IDErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+    }
+ 
+    hist ModTruncEOCErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+    }
+    hist ModTruncEOCErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+    }
+    hist ModTruncEOCErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+    }
+    hist ModTruncEOCErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+    }
+    hist ModTruncEOCErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+    }
+    hist ModTruncEOCErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+    }
+
+    hist ModTruncEoEOverflowErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+    }
+    hist ModTruncEoEOverflowErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+    }
+    hist ModTruncEoEOverflowErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+    }
+    hist ModTruncEoEOverflowErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+    }
+    hist ModTruncEoEOverflowErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+    }
+    hist ModTruncEoEOverflowErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+    }
+
+    hist ModTruncHitOverflowErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+    }
+    hist ModTruncHitOverflowErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+    }
+    hist ModTruncHitOverflowErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+    }
+    hist ModTruncHitOverflowErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+    }
+    hist ModTruncHitOverflowErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+    }
+    hist ModTruncHitOverflowErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+    }
+
+    hist OpticalErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+    }
+    hist OpticalErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+    }
+    hist OpticalErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+    }
+    hist OpticalErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+    }
+    hist OpticalErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+    }
+    hist OpticalErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+    }
+
+    hist RODSyncBCIDErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+    }
+    hist RODSyncBCIDErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+    }
+    hist RODSyncBCIDErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+    }
+    hist RODSyncBCIDErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+    }
+    hist RODSyncBCIDErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+    }
+    hist RODSyncBCIDErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+    }
+
+    hist RODSyncLVL1IDErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+    }
+    hist RODSyncLVL1IDErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+    }
+    hist RODSyncLVL1IDErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+    }
+    hist RODSyncLVL1IDErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+    }
+    hist RODSyncLVL1IDErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+    }
+    hist RODSyncLVL1IDErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+    }
+
+    hist RODTimeoutPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+    }
+    hist RODTimeoutPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+    }
+    hist RODTimeoutPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+    }
+    hist RODTimeoutPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+    }
+    hist RODTimeoutPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+    }
+    hist RODTimeoutPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+    }
+ 
+    hist RODTimeoutErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+    }
+    hist RODTimeoutErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+    }
+    hist RODTimeoutErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+    }
+    hist RODTimeoutErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+    }
+    hist RODTimeoutErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+    }
+    hist RODTimeoutErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+    }
+ 
+    hist RODTruncHTLimitErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+    }
+    hist RODTruncHTLimitErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+    }
+    hist RODTruncHTLimitErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+    }
+    hist RODTruncHTLimitErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+    }
+    hist RODTruncHTLimitErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+    }
+    hist RODTruncHTLimitErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+    }
+
+    hist RODTruncRODOFErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+    }
+    hist RODTruncRODOFErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+    }
+    hist RODTruncRODOFErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+    }
+    hist RODTruncRODOFErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+    }
+    hist RODTruncRODOFErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+    }
+    hist RODTruncRODOFErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+    }
+  
+    hist SEUHammingPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+    }
+    hist SEUHammingPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+    }
+    hist SEUHammingPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+    }
+    hist SEUHammingPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+    }
+    hist SEUHammingPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+    }
+    hist SEUHammingPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+    }
+
+    hist SEUHitParityPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+    }
+    hist SEUHitParityPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+    }
+    hist SEUHitParityPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+    }
+    hist SEUHitParityPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+    }
+    hist SEUHitParityPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+    }
+    hist SEUHitParityPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+    }
+
+    hist SEURegisterParityPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+    }
+    hist SEURegisterParityPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+    }
+    hist SEURegisterParityPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+    }
+    hist SEURegisterParityPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+    }
+    hist SEURegisterParityPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+    }
+    hist SEURegisterParityPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+    }
+
+    hist RODBCIDErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+    }
+    hist RODBCIDErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+    }
+    hist RODBCIDErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+    }
+    hist RODBCIDErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+    }
+    hist RODBCIDErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+    }
+    hist RODBCIDErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+    }
+
+    hist RODLVL1IDErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+    }
+    hist RODLVL1IDErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+    } 
+    hist RODLVL1IDErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+    } 
+    hist RODLVL1IDErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+    }
+    hist RODLVL1IDErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+    } 
+    hist RODLVL1IDErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+    }
+
+    hist RODLimitErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+    }
+    hist RODLimitErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+    }
+    hist RODLimitErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+    }
+    hist RODLimitErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+    }
+    hist RODLimitErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+    }
+    hist RODLimitErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+    }
+   
+    hist RODMaskedLinkPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+    }
+    hist RODMaskedLinkPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+    } 
+    hist RODMaskedLinkPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+    } 
+    hist RODMaskedLinkPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+    }
+    hist RODMaskedLinkPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+    } 
+    hist RODMaskedLinkPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+    }
+   
+    hist RODPreambleErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODPreambleErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODPreambleErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODPreambleErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODPreambleErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODPreambleErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist RODRowColumnErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODRowColumnErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODRowColumnErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODRowColumnErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODRowColumnErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODRowColumnErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist RODTrailerBitErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTrailerBitErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTrailerBitErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTrailerBitErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTrailerBitErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTrailerBitErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+ 
+    hist RODTrailerErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTrailerErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTrailerErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    } 
+    hist RODTrailerErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTrailerErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTrailerErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR0BCIDCounterErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR0BCIDCounterErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR0BCIDCounterErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR0BCIDCounterErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR0BCIDCounterErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR0BCIDCounterErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR1HammingCode0ErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR1HammingCode0ErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR1HammingCode0ErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR1HammingCode0ErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR1HammingCode0ErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR1HammingCode0ErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR2HammingCode1ErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR2HammingCode1ErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR2HammingCode1ErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR2HammingCode1ErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR2HammingCode1ErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR2HammingCode1ErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR3HammingCode2ErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR3HammingCode1ErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR3HammingCode2ErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR3HammingCode2ErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR3HammingCode2ErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR3HammingCode2ErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR4L1InCounterErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR4L1InCounterErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR4L1InCounterErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR4L1InCounterErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR4L1InCounterErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR4L1InCounterErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR5L1RequestCounterErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR5L1RequestCounterErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR5L1RequestCounterErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR5L1RequestCounterErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR5L1RequestCounterErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR5L1RequestCounterErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+     
+    hist SR6L1RegisterErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR6L1RegisterErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR6L1RegisterErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR6L1RegisterErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR6L1RegisterErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR6L1RegisterErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR7L1TriggerIDErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR7L1TriggerIDErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR7L1TriggerIDErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR7L1TriggerIDErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR7L1TriggerIDErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR7L1TriggerIDErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR8FEReadoutProcessErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR8FEReadoutProcessErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR8FEReadoutProcessErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR8FEReadoutProcessErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist SEURegisterParityPerLumi_B0 {
+    hist SR8FEReadoutProcessErrorsPerLumi_ECA {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Register_Parity
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist SEURegisterParityPerLumi_B1 {
+    hist SR8FEReadoutProcessErrorsPerLumi_ECC {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Register_Parity
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist SEURegisterParityPerLumi_B2 {
+
+    hist SR15SkipppedTrigCountErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR15SkipppedTrigCountErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR15SkipppedTrigCountErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR15SkipppedTrigCountErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR15SkipppedTrigCountErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR15SkipppedTrigCountErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR16TruncatedEventFlagErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR16TruncatedEventFlagErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR16TruncatedEventFlagErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR16TruncatedEventFlagErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR16TruncatedEventFlagErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR16TruncatedEventFlagErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR24TripleRedundantErrorsCNFGMEMPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR24TripleRedundantErrorsCNFGMEMPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR24TripleRedundantErrorsCNFGMEMPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR24TripleRedundantErrorsCNFGMEMPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR24TripleRedundantErrorsCNFGMEMPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR24TripleRedundantErrorsCNFGMEMPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR25WriteRegDataErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR25WriteRegDataErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR25WriteRegDataErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR25WriteRegDataErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR25WriteRegDataErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR25WriteRegDataErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR26AddressErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR26AddressErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR26AddressErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR26AddressErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR26AddressErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR26AddressErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR27OtherCMDDecoderErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR27OtherCMDDecoderErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR27OtherCMDDecoderErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR27OtherCMDDecoderErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR27OtherCMDDecoderErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR27OtherCMDDecoderErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR28CMDDecoderBitflipErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR28CMDDecoderBitflipErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR28CMDDecoderBitflipErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR28CMDDecoderBitflipErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR28CMDDecoderBitflipErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR28CMDDecoderBitflipErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+ 
+    hist SR29TripleRedundantErrorsCMDPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR29TripleRedundantErrorsCMDPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR29TripleRedundantErrorsCMDPerLumi_B1 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Register_Parity
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR29TripleRedundantErrorsCMDPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR29TripleRedundantErrorsCMDPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR29TripleRedundantErrorsCMDPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR30DataBusAddressErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR30DataBusAddressErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR30DataBusAddressErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR30DataBusAddressErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR30DataBusAddressErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR30DataBusAddressErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
 
+    hist SR31TripleRedundantErrorsEFUSEPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR31TripleRedundantErrorsEFUSEPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR31TripleRedundantErrorsEFUSEPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR31TripleRedundantErrorsEFUSEPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR31TripleRedundantErrorsEFUSEPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR31TripleRedundantErrorsEFUSEPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+ 
   }
 
 
@@ -1832,7 +4528,7 @@ dir Pixel {
   #Below plot Combined Tracks
   dir TrackOnTrack {
 
-    hist tracksPerEvtPerLumi {
+    hist TracksPerEvtPerLumi {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PixelExpert/Tracks
       display = StatBox
diff --git a/DataQuality/DataQualityConfigurations/config/Pixel/cosmics_run.config b/DataQuality/DataQualityConfigurations/config/Pixel/cosmics_run.config
index 6b48ce1db823ca01c0fe18ea242d6059679dd1c0..48af7b739110b372ef79ca22f4a808e7f7303399 100644
--- a/DataQuality/DataQualityConfigurations/config/Pixel/cosmics_run.config
+++ b/DataQuality/DataQualityConfigurations/config/Pixel/cosmics_run.config
@@ -1170,12 +1170,321 @@ dir Pixel {
 
   dir Errors {
 
+    hist OpticalErrors_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist OpticalErrors_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist OpticalErrors_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist OpticalErrors_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist OpticalErrors_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist OpticalErrors_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SyncErrors_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SyncErrors_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SyncErrors_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SyncErrors_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SyncErrors_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SyncErrors_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SyncErrorsMod_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    } 
+    hist SyncErrorsMod_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SyncErrorsMod_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SyncErrorsMod_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SyncErrorsMod_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SyncErrorsMod_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SyncErrorsROD_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SyncErrorsROD_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SyncErrorsROD_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SyncErrorsROD_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SyncErrorsROD_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SyncErrorsROD_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist TimeoutErrors_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist TimeoutErrors_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist TimeoutErrors_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist TimeoutErrors_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist TimeoutErrors_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist TimeoutErrors_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist FEMCCErrorwords_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist FEMCCErrorwords_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist FEMCCErrorwords_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist FEMCCErrorwords_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist FEMCCErrorwords_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist FEMCCErrorwords_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SEUErrors_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SEUErrors_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SEUErrors_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SEUErrors_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SEUErrors_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SEUErrors_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+   
+    hist TruncErrors_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    } 
+    hist TruncErrors_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist TruncErrors_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist TruncErrors_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist TruncErrors_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist TruncErrors_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist TruncErrorsMod_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    } 
+    hist TruncErrorsMod_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    } 
+    hist TruncErrorMod_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist TruncErrorsMod_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist TruncErrorsMod_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist TruncErrorsMod_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist TruncErrorsROD_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist TruncErrorsROD_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist TruncErrorROD_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist TruncErrorsROD_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist TruncErrorsROD_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist TruncErrorsROD_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
     hist SyncErrorsFracPerEvent_IBL {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIXIBL/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-
     hist SyncErrorsFracPerEvent_B0 {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIX0/DisableAndErrorsLB
@@ -1202,102 +1511,133 @@ dir Pixel {
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
 
-    hist SyncErrorsRODFracPerEvent_IBL {
+    hist SyncErrorsModFracPerEvent_IBL {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIXIBL/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist SyncErrorsRODFracPerEvent_B0 {
+    hist SyncErrorsModFracPerEvent_B0 {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIX0/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist SyncErrorsRODFracPerEvent_B1 {
+    hist SyncErrorsModFracPerEvent_B1 {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIX1/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist SyncErrorsRODFracPerEvent_B2 {
+    hist SyncErrorsModFracPerEvent_B2 {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIX2/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist SyncErrorsRODFracPerEvent_ECA {
+    hist SyncErrorsModFracPerEvent_ECA {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIXECA/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist SyncErrorsRODFracPerEvent_ECC {
+    hist SyncErrorsModFracPerEvent_ECC {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIXECC/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
-    }
+    } 
 
-    hist ErrorStatePerLumi_IBL {
+    hist SyncErrorsRODFracPerEvent_IBL {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIXIBL/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist ErrorStatePerLumi_B0 {
+    hist SyncErrorsRODFracPerEvent_B0 {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIX0/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist ErrorStatePerLumi_B1 {
+    hist SyncErrorsRODFracPerEvent_B1 {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIX1/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist ErrorStatePerLumi_B2 {
+    hist SyncErrorsRODFracPerEvent_B2 {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIX2/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist ErrorStatePerLumi_ECA {
+    hist SyncErrorsRODFracPerEvent_ECA {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIXECA/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
-    hist ErrorStatePerLumi_ECC {
+    hist SyncErrorsRODFracPerEvent_ECC {
       algorithm = Pix_NonZero_Errors
       output = InnerDetector/Pixel/PIXECC/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
 
+    #hist ErrorStatePerLumi_IBL {
+    #  algorithm = Pix_NonZero_Errors
+    #  output = InnerDetector/Pixel/PIXIBL/DisableAndErrorsLB
+    #  description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
+    #}
+    #hist ErrorStatePerLumi_B0 {
+    #  algorithm = Pix_NonZero_Errors
+    #  output = InnerDetector/Pixel/PIX0/DisableAndErrorsLB
+    #  description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
+    #}
+    #hist ErrorStatePerLumi_B1 {
+    #  algorithm = Pix_NonZero_Errors
+    #  output = InnerDetector/Pixel/PIX1/DisableAndErrorsLB
+    #  description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
+    #}
+    #hist ErrorStatePerLumi_B2 {
+    #  algorithm = Pix_NonZero_Errors
+    #  output = InnerDetector/Pixel/PIX2/DisableAndErrorsLB
+    #  description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
+    #}
+    #hist ErrorStatePerLumi_ECA {
+    #  algorithm = Pix_NonZero_Errors
+    #  output = InnerDetector/Pixel/PIXECA/DisableAndErrorsLB
+    #  description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
+    #}
+    #hist ErrorStatePerLumi_ECC {
+    #  algorithm = Pix_NonZero_Errors
+    #  output = InnerDetector/Pixel/PIXECC/DisableAndErrorsLB
+    #  description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
+    #}
+
     hist SEUErrorsFracPerEvent_IBL {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
-      output = InnerDetector/Pixel/PIXIBL/DisableAndErrorsLB
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
     hist SEUErrorsFracPerEvent_B0 {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
-      output = InnerDetector/Pixel/PIX0/DisableAndErrorsLB
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
     hist SEUErrorsFracPerEvent_B1 {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
-      output = InnerDetector/Pixel/PIX1/DisableAndErrorsLB
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
     hist SEUErrorsFracPerEvent_B2 {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
-      output = InnerDetector/Pixel/PIX2/DisableAndErrorsLB
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
     hist SEUErrorsFracPerEvent_ECA {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
-      output = InnerDetector/Pixel/PIXECA/DisableAndErrorsLB
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
     hist SEUErrorsFracPerEvent_ECC {
       #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
-      output = InnerDetector/Pixel/PIXECC/DisableAndErrorsLB
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
 
@@ -1376,41 +1716,99 @@ dir Pixel {
     }
 
     hist TruncationErrorsFracPerEvent_IBL {
-      #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
-      output = InnerDetector/Pixel/PIXIBL/DisableAndErrorsLB
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
     hist TruncationErrorsFracPerEvent_B0 {
-      #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
-      output = InnerDetector/Pixel/PIX0/DisableAndErrorsLB
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
     hist TruncationErrorsFracPerEvent_B1 {
-      #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
-      output = InnerDetector/Pixel/PIX1/DisableAndErrorsLB
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
     hist TruncationErrorsFracPerEvent_B2 {
-      #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
-      output = InnerDetector/Pixel/PIX2/DisableAndErrorsLB
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
     hist TruncationErrorsFracPerEvent_ECA {
-      #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
-      output = InnerDetector/Pixel/PIXECA/DisableAndErrorsLB
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
     hist TruncationErrorsFracPerEvent_ECC {
-      #algorithm = Pix_NonZero_Errors
       algorithm = Pix_Frac_Errors
-      output = InnerDetector/Pixel/PIXECC/DisableAndErrorsLB
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
+    }
+
+    hist TruncErrorsModFracPerEvent_IBL {
+      algorithm = Pix_Frac_Errors
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
+    }
+    hist TruncErrorsModFracPerEvent_B0 {
+      algorithm = Pix_Frac_Errors
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
+    }
+    hist TruncErrorsModFracPerEvent_B1 {
+      algorithm = Pix_Frac_Errors
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
+    }
+    hist TruncErrorsModFracPerEvent_B2 {
+      algorithm = Pix_Frac_Errors
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
+    }
+    hist TruncErrorsModFracPerEvent_ECA {
+      algorithm = Pix_Frac_Errors
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
+    }
+    hist TruncErrorsModFracPerEvent_ECC {
+      algorithm = Pix_Frac_Errors
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
+    } 
+   
+    hist TruncErrorsRODFracPerEvent_IBL {
+      algorithm = Pix_Frac_Errors
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
+    }
+    hist TruncErrorsRODFracPerEvent_B0 {
+      algorithm = Pix_Frac_Errors
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
+    }
+    hist TruncErrorsRODFracPerEvent_B1 {
+      algorithm = Pix_Frac_Errors
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
+    }
+    hist TruncErrorsRODFracPerEvent_B2 {
+      algorithm = Pix_Frac_Errors
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
+    }
+    hist TruncErrorsRODFracPerEvent_ECA {
+      algorithm = Pix_Frac_Errors
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
+    }
+    hist TruncErrorsRODFracPerEvent_ECC {
+      algorithm = Pix_Frac_Errors
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
       description = https://twiki.cern.ch/twiki/bin/viewauth/Atlas/PixelOfflineShiftInstructionsDQRun2#Errors
     }
+ 
+  
 
     ######################################
     hist SyncErrorsFracPerEvent_IBL {
@@ -1484,347 +1882,2645 @@ dir Pixel {
 
   dir ErrorsExpert {
 
-    #hist FE_Warning_per_lumi_PIX {
-    #  algorithm = Plain_GatherData
-    #  output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/FE_Warning
-    #}
-    hist FEWarningPerLumi_ECA {
+    hist ServiceRecordUnweighted_IBL {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/FE_Warning
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist FEWarningPerLumi_ECC {
+    hist ServiceRecordUnweighted_B0 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/FE_Warning
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist FEWarningPerLumi_B0 {
+    hist ServiceRecordUnweighted_B1 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/FE_Warning
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist FEWarningPerLumi_B1 {
+    hist ServiceRecordUnweighted_B2 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/FE_Warning
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist FEWarningPerLumi_B2 {
+    hist ServiceRecordUnweighted_ECA {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/FE_Warning
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-
-    hist ModSyncBCID1ErrorsPerLumi_ECA {
+    hist ServiceRecordUnweighted_ECC {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_BCID1
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist ModSyncBCID1ErrorsPerLumi_ECC {
+
+    hist ServiceRecordWeighted_IBL {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_BCID1
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist ModSyncBCID1ErrorsPerLumi_B0 {
+    hist ServiceRecordWeighted_B0 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_BCID1
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist ModSyncBCID1ErrorsPerLumi_B1 {
+    hist ServiceRecordWeighted_B1 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_BCID1
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist ModSyncBCID1ErrorsPerLumi_B2 {
+    hist ServiceRecordWeighted_B2 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_BCID1
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-
-    hist ModSyncBCID2ErrorsPerLumi_B0 {
+    hist ServiceRecordWeighted_ECA {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_BCID2
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist ModSyncBCID2ErrorsPerLumi_B1 {
+    hist ServiceRecordWeighted_ECC {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_BCID2
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist ModSyncBCID2ErrorsPerLumi_B2 {
+
+    hist FEWarningMap_IBL {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_BCID2
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist ModSyncBCID2ErrorsPerLumi_ECA {
+    hist FEWarningMap_B0 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_BCID2
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist ModSyncBCID2ErrorsPerLumi_ECC {
+    hist FEWarningMap_B1 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_BCID2
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-
-    hist ModSyncLVL1IDErrorsPerLumi_B0 {
+    hist FEWarningMap_B2 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_LVL1ID
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist ModSyncLVL1IDErrorsPerLumi_B1 {
+    hist FEWarningMap_ECA {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_LVL1ID
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist ModSyncLVL1IDErrorsPerLumi_B2 {
+    hist FEWarningMap_ECC {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_LVL1ID
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist ModSyncLVL1IDErrorsPerLumi_ECA {
+
+    hist ModSyncBCID1ErrorsMap_IBL {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_LVL1ID
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist ModSyncLVL1IDErrorsPerLumi_ECC {
+    hist ModSyncBCID1ErrorsMap_B0 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_Module_LVL1ID
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-
-    hist ModTruncEOCErrorsPerLumi_ECA {
+    hist ModSyncBCID1ErrorsMap_B1 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_EoC
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist ModTruncEOCErrorsPerLumi_ECC {
+    hist ModSyncBCID1ErrorsMap_B2 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_EoC
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist ModTruncEOCErrorsPerLumi_B0 {
+    hist ModSyncBCID1ErrorsMap_ECA {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_EoC
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist ModTruncEOCErrorsPerLumi_B1 {
+    hist ModSyncBCID1ErrorsMap_ECC {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_EoC
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist ModTruncEOCErrorsPerLumi_B2 {
+
+    hist ModSyncBCID2ErrorsMap_IBL {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_EoC
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-
-    hist ModTruncEoEOverflowErrorsPerLumi_B0 {
+    hist ModSyncBCID2ErrorsMap_B0 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_EoE_Overflow
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist ModTruncEoEOverflowErrorsPerLumi_B1 {
+    hist ModSyncBCID2ErrorsMap_B1 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_EoE_Overflow
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist ModTruncEoEOverflowErrorsPerLumi_B2 {
+    hist ModSyncBCID2ErrorsMap_B2 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_EoE_Overflow
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist ModTruncEoEOverflowErrorsPerLumi_ECA {
+    hist ModSyncBCID2ErrorsMap_ECA {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_EoE_Overflow
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist ModTruncEoEOverflowErrorsPerLumi_ECC {
+    hist ModSyncBCID2ErrorsMap_ECC {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_EoE_Overflow
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
 
-    hist ModTruncHitOverflowErrorsPerLumi_B0 {
+    hist ModSyncLVL1IDErrorsMap_IBL {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_Hit_Overflow
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist ModTruncHitOverflowErrorsPerLumi_B1 {
+    hist ModSyncLVL1IDErrorsMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist ModSyncLVL1IDErrorsMap_B1 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_Hit_Overflow
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist ModTruncHitOverflowErrorsPerLumi_B2 {
+    hist ModSyncLVL1IDErrorsMap_B2 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_Hit_Overflow
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist ModTruncHitOverflowErrorsPerLumi_ECA {
+    hist ModSyncLVL1IDErrorsMap_ECA {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_Hit_Overflow
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist ModTruncHitOverflowErrorsPerLumi_ECC {
+    hist ModSyncLVL1IDErrorsMap_ECC {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_Module_Hit_Overflow
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
 
-    hist OpticalErrorsPerLumi_B0 {
+    hist ModTruncEOCErrorsMap_IBL {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Optical_Errors
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist OpticalErrorsPerLumi_B1 {
+    hist ModTruncEOCErrorsMap_B0 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Optical_Errors
-    }
-    hist OpticalErrorsPerLumi_B2 {
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    } 
+    hist ModTruncEOCErrorsMap_B1 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Optical_Errors
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    } 
+    hist ModTruncEOCErrorsMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist OpticalErrorsPerLumi_ECA {
+    hist ModTruncEOCErrorsMap_ECA {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Optical_Errors
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist OpticalErrorsPerLumi_ECC {
+    hist ModTruncEOCErrorsMap_ECC {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Optical_Errors
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
 
-    hist RODSyncBCIDErrorsPerLumi_B0 {
+   hist ModTruncEoEOverflowErrorsMap_IBL { 
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_ROD_BCID
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist RODSyncBCIDErrorsPerLumi_B1 {
+    hist ModTruncEoEOverflowErrorsMap_B0 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_ROD_BCID
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist RODSyncBCIDErrorsPerLumi_B2 {
+    hist ModTruncEoEOverflowErrorsMap_B1 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_ROD_BCID
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist RODSyncBCIDErrorsPerLumi_ECA {
+    hist ModTruncEoEOverflowErrorsMap_B2 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_ROD_BCID
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist RODSyncBCIDErrorsPerLumi_ECC {
+    hist ModTruncEoEOverflowErrorsMap_ECA {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_ROD_BCID
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
+    hist ModTruncEoEOverflowErrorsMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    } 
 
-    hist RODSyncLVL1IDErrorsPerLumi_B0 {
+    hist ModTruncHitOverflowErrorsMap_IBL {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_ROD_LVL1ID
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist RODSyncLVL1IDErrorsPerLumi_B1 {
+    hist ModTruncHitOverflowErrorsMap_B0 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_ROD_LVL1ID
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist RODSyncLVL1IDErrorsPerLumi_B2 {
+    hist ModTruncHitOverflowErrorsMap_B1 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_ROD_LVL1ID
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist RODSyncLVL1IDErrorsPerLumi_ECA {
+    hist ModTruncHitOverflowErrorsMap_B2 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_ROD_LVL1ID
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist RODSyncLVL1IDErrorsPerLumi_ECC {
+    hist ModTruncHitOverflowErrorsMap_ECA {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Synchronization_ROD_LVL1ID
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-
-    hist RODTimeoutPerLumi_B0 {
+    hist ModTruncHitOverflowErrorsMap_ECC {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/ROD_Timeout
-    }
-    hist RODTimeoutPerLumi_B1 {
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }    
+
+    hist OpticalErrorsMap_IBL {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/ROD_Timeout
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist RODTimeoutPerLumi_B2 {
+    hist OpticalErrorsMap_B0 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/ROD_Timeout
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist RODTimeoutPerLumi_ECA {
+    hist OpticalErrorsMap_B1 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/ROD_Timeout
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist RODTimeoutPerLumi_ECC {
+    hist OpticalErrorsMap_B2 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/ROD_Timeout
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-
-    hist RODTruncHTLimitErrorsPerLumi_B0 {
+    hist OpticalErrorsMap_ECA {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_ROD_HT_Limit
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist RODTruncHTLimitErrorsPerLumi_B1 {
+    hist OpticalErrorsMap_ECC {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_ROD_HT_Limit
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist RODTruncHTLimitErrorsPerLumi_B2 {
+ 
+    hist RODBCIDErrorsMap_IBL {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_ROD_HT_Limit
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist RODTruncHTLimitErrorsPerLumi_ECA {
+    hist RODBCIDErrorsMap_B0 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_ROD_HT_Limit
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist RODTruncHTLimitErrorsPerLumi_ECC {
+    hist RODBCIDErrorsMap_B1 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_ROD_HT_Limit
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-
-    hist RODTruncRODOFErrorsPerLumi_B0 {
+    hist RODBCIDErrorsMap_B2 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_ROD_FIFO_Overflow
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist RODTruncRODOFErrorsPerLumi_B1 {
+    hist RODBCIDErrorsMap_ECA {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_ROD_FIFO_Overflow
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist RODTruncRODOFErrorsPerLumi_B2 {
+    hist RODBCIDErrorsMap_ECC {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_ROD_FIFO_Overflow
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist RODTruncRODOFErrorsPerLumi_ECA {
+
+    hist RODLVL1IDErrorsMap_IBL {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_ROD_FIFO_Overflow
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist RODTruncRODOFErrorsPerLumi_ECC {
+    hist RODLVL1IDErrorsMap_B0 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/Truncation_ROD_FIFO_Overflow
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-
-
-    hist SEUHammingPerLumi_ECA {
+    hist RODLVL1IDErrorsMap_B1 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Hamming
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist SEUHammingPerLumi_ECC {
+    hist RODLVL1IDErrorsMap_B2 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Hamming
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist SEUHammingPerLumi_B0 {
+    hist RODLVL1IDErrorsMap_ECA {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Hamming
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist SEUHammingPerLumi_B1 {
+    hist RODLVL1IDErrorsMap_ECC {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Hamming
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist SEUHammingPerLumi_B2 {
+
+    hist RODLimitErrorsMap_IBL {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Hamming
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-
-    hist SEUHitParityPerLumi_ECA {
+    hist RODLimitErrorsMap_B0 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Hit_Parity
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist SEUHitParityPerLumi_ECC {
+    hist RODLimitErrorsMap_B1 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Hit_Parity
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist SEUHitParityPerLumi_B0 {
+    hist RODLimitErrorsMap_B2 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Hit_Parity
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist SEUHitParityPerLumi_B1 {
+    hist RODLimitErrorsMap_ECA {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Hit_Parity
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist SEUHitParityPerLumi_B2 {
+    hist RODLimitErrorsMap_ECC {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Hit_Parity
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
 
-    hist SEURegisterParityPerLumi_ECA {
+    hist RODPreambleErrorsMap_IBL {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Register_Parity
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist SEURegisterParityPerLumi_ECC {
+    hist RODPreambleErrorsMap_B0 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Register_Parity
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODPreambleErrorsMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODPreambleErrorsMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODPreambleErrorsMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODPreambleErrorsMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    
+    hist RODRowColumnErrorsMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODRowColumnErrorsMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODRowColumnErrorsMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODRowColumnErrorsMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODRowColumnErrorsMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODRowColumnErrorsMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    
+    hist RODSyncBCIDErrorsMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODSyncBCIDErrorsMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODSyncBCIDErrorsMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODSyncBCIDErrorsMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODSyncBCIDErrorsMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODSyncBCIDErrorsMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    } 
+
+    hist RODSyncLVL1IDErrorsMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODSyncLVL1IDErrorsMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODSyncLVL1IDErrorsMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODSyncLVL1IDErrorsMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODSyncLVL1IDErrorsMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODSyncLVL1IDErrorsMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist RODTimeoutMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTimeoutMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTimeoutMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTimeoutMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTimeoutMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTimeoutMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist RODTimeoutErrorsMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTimeoutErrorsMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTimeoutErrorsMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTimeoutErrorsMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTimeoutErrorsMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTimeoutErrorsMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist RODTrailerBitErrorsMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTrailerBitErrorsMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTrailerBitErrorsMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTrailerBitErrorsMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTrailerBitErrorsMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTrailerBitErrorsMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    
+    hist RODTrailerErrorsMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTrailerErrorsMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTrailerErrorsMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTrailerErrorsMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTrailerErrorsMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTrailerErrorsMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+ 
+    hist RODTruncHTLimitErrorsMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTruncHTLimitErrorsMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTruncHTLimitErrorsMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTruncHTLimitErrorsMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTruncHTLimitErrorsMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTruncHTLimitErrorsMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist RODTruncRODOFErrorsMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTruncRODOFErrorsMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTruncRODOFErrorsMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTruncRODOFErrorsMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTruncRODOFErrorsMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTruncRODOFErrorsMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SEUHammingMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SEUHammingMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SEUHammingMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SEUHammingMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SEUHammingMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SEUHammingMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+   
+    hist SEUHitParityMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SEUHitParityMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SEUHitParityMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SEUHitParityMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SEUHitParityMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SEUHitParityMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+  
+    hist SEURegisterParityMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SEURegisterParityMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SEURegisterParityMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SEURegisterParityMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SEURegisterParityMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SEURegisterParityMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR0BCIDCounterErrorsMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR0BCIDCounterErrorsMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR0BCIDCounterErrorsMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR0BCIDCounterErrorsMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR0BCIDCounterErrorsMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR0BCIDCounterErrorsMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR1HammingCode0ErrorsMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR1HammingCode0ErrorsMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR1HammingCode0ErrorsMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR1HammingCode0ErrorsMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR1HammingCode0ErrorsMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR1HammingCode0ErrorsMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    } 
+
+    hist SR2HammingCode1ErrorsMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR2HammingCode1ErrorsMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR2HammingCode1ErrorsMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR2HammingCode1ErrorsMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR2HammingCode1ErrorsMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR2HammingCode1ErrorsMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR3HammingCode2ErrorsMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR3HammingCode2ErrorsMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR3HammingCode2ErrorsMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR3HammingCode2ErrorsMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR3HammingCode2ErrorsMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR3HammingCode2ErrorsMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR4L1InCounterErrorsMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR4L1InCounterErrorsMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR4L1InCounterErrorsMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR4L1InCounterErrorsMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR4L1InCounterErrorsMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR4L1InCounterErrorsMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR5L1RequestCounterErrorsMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR5L1RequestCounterErrorsMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR5L1RequestCounterErrorsMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR5L1RequestCounterErrorsMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR5L1RequestCounterErrorsMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR5L1RequestCounterErrorsMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR6L1RegisterErrorsMap_IBL { 
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR6L1RegisterErrorsMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR6L1RegisterErrorsMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR6L1RegisterErrorsMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR6L1RegisterErrorsMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR6L1RegisterErrorsMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR7L1TriggerIDErrorsMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR7L1TriggerIDErrorsMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR7L1TriggerIDErrorsMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR7L1TriggerIDErrorsMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR7L1TriggerIDErrorsMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR7L1TriggerIDErrorsMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR8FEReadoutProcessErrorsMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR8FEReadoutProcessErrorsMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR8FEReadoutProcessErrorsMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR8FEReadoutProcessErrorsMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR8FEReadoutProcessErrorsMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR8FEReadoutProcessErrorsMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR15SkipppedTrigCountErrorsMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR15SkipppedTrigCountErrorsMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR15SkipppedTrigCountErrorsMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR15SkipppedTrigCountErrorsMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR15SkipppedTrigCountErrorsMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR15SkipppedTrigCountErrorsMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+ 
+    hist SR16TruncatedEventFlagErrorsMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR16TruncatedEventFlagErrorsMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR16TruncatedEventFlagErrorsMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR16TruncatedEventFlagErrorsMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR16TruncatedEventFlagErrorsMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR16TruncatedEventFlagErrorsMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR24TripleRedundantErrorsCNFGMEMMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR24TripleRedundantErrorsCNFGMEMMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR24TripleRedundantErrorsCNFGMEMMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR24TripleRedundantErrorsCNFGMEMMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR24TripleRedundantErrorsCNFGMEMMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR24TripleRedundantErrorsCNFGMEMMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR25WriteRegDataErrorsMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR25WriteRegDataErrorsMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR25WriteRegDataErrorsMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR25WriteRegDataErrorsMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR25WriteRegDataErrorsMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR25WriteRegDataErrorsMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR26AddressErrorsMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR26AddressErrorsMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR26AddressErrorsMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR26AddressErrorsMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR26AddressErrorsMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR26AddressErrorsMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR27OtherCMDDecoderErrorsMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR27OtherCMDDecoderErrorsMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR27OtherCMDDecoderErrorsMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR27OtherCMDDecoderErrorsMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR27OtherCMDDecoderErrorsMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR27OtherCMDDecoderErrorsMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR28CMDDecoderBitflipErrorsMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR28CMDDecoderBitflipErrorsMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR28CMDDecoderBitflipErrorsMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR28CMDDecoderBitflipErrorsMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR28CMDDecoderBitflipErrorsMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR28CMDDecoderBitflipErrorsMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR29TripleRedundantErrorsMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR29TripleRedundantErrorsMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR29TripleRedundantErrorsMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR29TripleRedundantErrorsMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR29TripleRedundantErrorsMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR29TripleRedundantErrorsMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR30DataBusAddressErrorsMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR30DataBusAddressErrorsMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR30DataBusAddressErrorsMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR30DataBusAddressErrorsMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR30DataBusAddressErrorsMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR30DataBusAddressErrorsMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR31TripleRedundantErrorsEFUSEMap_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR31TripleRedundantErrorsEFUSEMap_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR31TripleRedundantErrorsEFUSEMap_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR31TripleRedundantErrorsEFUSEMap_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR31TripleRedundantErrorsEFUSEMap_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR31TripleRedundantErrorsEFUSEMap_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrors
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+  
+    #hist FE_Warning_per_lumi_PIX {
+    #  algorithm = Plain_GatherData
+    #  output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/FE_Warning
+    #}
+    hist FEWarningPerLumi_ECA {
+      algorithm = Plain_GatherData
+      #output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/FE_Warning
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+    }
+    hist FEWarningPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+    }
+    hist FEWarningPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+    }
+    hist FEWarningPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+    }
+    hist FEWarningPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+    }
+    hist FEWarningPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+    }
+  
+
+    hist ModSyncBCID1ErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+    }
+    hist ModSyncBCID1ErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+    }
+    hist ModSyncBCID1ErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+    }
+    hist ModSyncBCID1ErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+    }
+    hist ModSyncBCID1ErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+    }
+    hist ModSyncBCID1ErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+    }
+
+    hist ModSyncBCID2ErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+    }
+    hist ModSyncBCID2ErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+    }
+    hist ModSyncBCID2ErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+    }
+    hist ModSyncBCID2ErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+    }
+    hist ModSyncBCID2ErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+    }
+    hist ModSyncBCID2ErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+    }
+
+    hist ModSyncLVL1IDErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+    }
+    hist ModSyncLVL1IDErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+    }
+    hist ModSyncLVL1IDErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+    }
+    hist ModSyncLVL1IDErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+    }
+    hist ModSyncLVL1IDErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+    }
+    hist ModSyncLVL1IDErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+    }
+ 
+    hist ModTruncEOCErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+    }
+    hist ModTruncEOCErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+    }
+    hist ModTruncEOCErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+    }
+    hist ModTruncEOCErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+    }
+    hist ModTruncEOCErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+    }
+    hist ModTruncEOCErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+    }
+
+    hist ModTruncEoEOverflowErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+    }
+    hist ModTruncEoEOverflowErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+    }
+    hist ModTruncEoEOverflowErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+    }
+    hist ModTruncEoEOverflowErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+    }
+    hist ModTruncEoEOverflowErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+    }
+    hist ModTruncEoEOverflowErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+    }
+
+    hist ModTruncHitOverflowErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+    }
+    hist ModTruncHitOverflowErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+    }
+    hist ModTruncHitOverflowErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+    }
+    hist ModTruncHitOverflowErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+    }
+    hist ModTruncHitOverflowErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+    }
+    hist ModTruncHitOverflowErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+    }
+
+    hist OpticalErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+    }
+    hist OpticalErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+    }
+    hist OpticalErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+    }
+    hist OpticalErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+    }
+    hist OpticalErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+    }
+    hist OpticalErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+    }
+
+    hist RODSyncBCIDErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+    }
+    hist RODSyncBCIDErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+    }
+    hist RODSyncBCIDErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+    }
+    hist RODSyncBCIDErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+    }
+    hist RODSyncBCIDErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+    }
+    hist RODSyncBCIDErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+    }
+
+    hist RODSyncLVL1IDErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+    }
+    hist RODSyncLVL1IDErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+    }
+    hist RODSyncLVL1IDErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+    }
+    hist RODSyncLVL1IDErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+    }
+    hist RODSyncLVL1IDErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+    }
+    hist RODSyncLVL1IDErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+    }
+
+    hist RODTimeoutPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+    }
+    hist RODTimeoutPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+    }
+    hist RODTimeoutPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+    }
+    hist RODTimeoutPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+    }
+    hist RODTimeoutPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+    }
+    hist RODTimeoutPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+    }
+ 
+    hist RODTimeoutErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+    }
+    hist RODTimeoutErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+    }
+    hist RODTimeoutErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+    }
+    hist RODTimeoutErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+    }
+    hist RODTimeoutErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+    }
+    hist RODTimeoutErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+    }
+ 
+    hist RODTruncHTLimitErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+    }
+    hist RODTruncHTLimitErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+    }
+    hist RODTruncHTLimitErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+    }
+    hist RODTruncHTLimitErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+    }
+    hist RODTruncHTLimitErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+    }
+    hist RODTruncHTLimitErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+    }
+
+    hist RODTruncRODOFErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+    }
+    hist RODTruncRODOFErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+    }
+    hist RODTruncRODOFErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+    }
+    hist RODTruncRODOFErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+    }
+    hist RODTruncRODOFErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+    }
+    hist RODTruncRODOFErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+    }
+  
+    hist SEUHammingPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+    }
+    hist SEUHammingPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+    }
+    hist SEUHammingPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+    }
+    hist SEUHammingPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+    }
+    hist SEUHammingPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+    }
+    hist SEUHammingPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+    }
+
+    hist SEUHitParityPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+    }
+    hist SEUHitParityPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+    }
+    hist SEUHitParityPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+    }
+    hist SEUHitParityPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+    }
+    hist SEUHitParityPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+    }
+    hist SEUHitParityPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+    }
+
+    hist SEURegisterParityPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+    }
+    hist SEURegisterParityPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+    }
+    hist SEURegisterParityPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+    }
+    hist SEURegisterParityPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+    }
+    hist SEURegisterParityPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+    }
+    hist SEURegisterParityPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+    }
+
+    hist RODBCIDErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+    }
+    hist RODBCIDErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+    }
+    hist RODBCIDErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+    }
+    hist RODBCIDErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+    }
+    hist RODBCIDErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+    }
+    hist RODBCIDErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+    }
+
+    hist RODLVL1IDErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+    }
+    hist RODLVL1IDErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+    } 
+    hist RODLVL1IDErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+    } 
+    hist RODLVL1IDErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+    }
+    hist RODLVL1IDErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+    } 
+    hist RODLVL1IDErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+    }
+
+    hist RODLimitErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+    }
+    hist RODLimitErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+    }
+    hist RODLimitErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+    }
+    hist RODLimitErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+    }
+    hist RODLimitErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+    }
+    hist RODLimitErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+    }
+   
+    hist RODMaskedLinkPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+    }
+    hist RODMaskedLinkPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+    } 
+    hist RODMaskedLinkPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+    } 
+    hist RODMaskedLinkPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+    }
+    hist RODMaskedLinkPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+    } 
+    hist RODMaskedLinkPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+    }
+   
+    hist RODPreambleErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODPreambleErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODPreambleErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODPreambleErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODPreambleErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODPreambleErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist RODRowColumnErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODRowColumnErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODRowColumnErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODRowColumnErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODRowColumnErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODRowColumnErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist RODTrailerBitErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTrailerBitErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTrailerBitErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTrailerBitErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTrailerBitErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTrailerBitErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+ 
+    hist RODTrailerErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTrailerErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTrailerErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    } 
+    hist RODTrailerErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTrailerErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist RODTrailerErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR0BCIDCounterErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR0BCIDCounterErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR0BCIDCounterErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR0BCIDCounterErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR0BCIDCounterErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR0BCIDCounterErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR1HammingCode0ErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR1HammingCode0ErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR1HammingCode0ErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR1HammingCode0ErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR1HammingCode0ErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR1HammingCode0ErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR2HammingCode1ErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR2HammingCode1ErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR2HammingCode1ErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR2HammingCode1ErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR2HammingCode1ErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR2HammingCode1ErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR3HammingCode2ErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR3HammingCode1ErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR3HammingCode2ErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR3HammingCode2ErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR3HammingCode2ErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR3HammingCode2ErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR4L1InCounterErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR4L1InCounterErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR4L1InCounterErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR4L1InCounterErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR4L1InCounterErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR4L1InCounterErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR5L1RequestCounterErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR5L1RequestCounterErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR5L1RequestCounterErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR5L1RequestCounterErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR5L1RequestCounterErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR5L1RequestCounterErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+     
+    hist SR6L1RegisterErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR6L1RegisterErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR6L1RegisterErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR6L1RegisterErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR6L1RegisterErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR6L1RegisterErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR7L1TriggerIDErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR7L1TriggerIDErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR7L1TriggerIDErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR7L1TriggerIDErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR7L1TriggerIDErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR7L1TriggerIDErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR8FEReadoutProcessErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR8FEReadoutProcessErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR8FEReadoutProcessErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR8FEReadoutProcessErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist SEURegisterParityPerLumi_B0 {
+    hist SR8FEReadoutProcessErrorsPerLumi_ECA {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Register_Parity
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist SEURegisterParityPerLumi_B1 {
+    hist SR8FEReadoutProcessErrorsPerLumi_ECC {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Register_Parity
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
-    hist SEURegisterParityPerLumi_B2 {
+
+    hist SR15SkipppedTrigCountErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR15SkipppedTrigCountErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR15SkipppedTrigCountErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR15SkipppedTrigCountErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR15SkipppedTrigCountErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR15SkipppedTrigCountErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR16TruncatedEventFlagErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR16TruncatedEventFlagErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR16TruncatedEventFlagErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR16TruncatedEventFlagErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR16TruncatedEventFlagErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR16TruncatedEventFlagErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR24TripleRedundantErrorsCNFGMEMPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR24TripleRedundantErrorsCNFGMEMPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR24TripleRedundantErrorsCNFGMEMPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR24TripleRedundantErrorsCNFGMEMPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR24TripleRedundantErrorsCNFGMEMPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR24TripleRedundantErrorsCNFGMEMPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR25WriteRegDataErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR25WriteRegDataErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR25WriteRegDataErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR25WriteRegDataErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR25WriteRegDataErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR25WriteRegDataErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR26AddressErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR26AddressErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR26AddressErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR26AddressErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR26AddressErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR26AddressErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR27OtherCMDDecoderErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR27OtherCMDDecoderErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR27OtherCMDDecoderErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR27OtherCMDDecoderErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR27OtherCMDDecoderErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR27OtherCMDDecoderErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR28CMDDecoderBitflipErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR28CMDDecoderBitflipErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR28CMDDecoderBitflipErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR28CMDDecoderBitflipErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR28CMDDecoderBitflipErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR28CMDDecoderBitflipErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+ 
+    hist SR29TripleRedundantErrorsCMDPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR29TripleRedundantErrorsCMDPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR29TripleRedundantErrorsCMDPerLumi_B1 {
       algorithm = Plain_GatherData
-      output = InnerDetector/Pixel/PixelExpert/Errors/Bad_Module_Errors/SEU_Register_Parity
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR29TripleRedundantErrorsCMDPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR29TripleRedundantErrorsCMDPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR29TripleRedundantErrorsCMDPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+
+    hist SR30DataBusAddressErrorsPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR30DataBusAddressErrorsPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR30DataBusAddressErrorsPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR30DataBusAddressErrorsPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR30DataBusAddressErrorsPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR30DataBusAddressErrorsPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
     }
 
+    hist SR31TripleRedundantErrorsEFUSEPerLumi_IBL {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXIBL/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR31TripleRedundantErrorsEFUSEPerLumi_B0 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX0/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR31TripleRedundantErrorsEFUSEPerLumi_B1 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX1/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR31TripleRedundantErrorsEFUSEPerLumi_B2 {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIX2/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR31TripleRedundantErrorsEFUSEPerLumi_ECA {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECA/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+    hist SR31TripleRedundantErrorsEFUSEPerLumi_ECC {
+      algorithm = Plain_GatherData
+      output = InnerDetector/Pixel/PIXECC/_Experts/DisableAndErrorsLB
+      description = https://twiki.cern.ch/twiki/bin/view/Atlas/PixelOfflineShiftInstructionsDQ#Disabled_Modules
+    }
+ 
   }
 
 
@@ -1832,7 +4528,7 @@ dir Pixel {
   #Below plot Combined Tracks
   dir TrackOnTrack {
 
-    hist tracksPerEvtPerLumi {
+    hist TracksPerEvtPerLumi {
       algorithm = Pix_LB_Bins_Diff_FromAvg
       output = InnerDetector/Pixel/PixelExpert/Tracks
       display = StatBox
diff --git a/Database/APR/CollectionUtilities/src/Args2Container.cpp b/Database/APR/CollectionUtilities/src/Args2Container.cpp
index 1dcbd2514a518e4749b06000c77cddf2bdd14828..577838539a862d8568d82522ed52c81a2f8ad115 100644
--- a/Database/APR/CollectionUtilities/src/Args2Container.cpp
+++ b/Database/APR/CollectionUtilities/src/Args2Container.cpp
@@ -15,20 +15,14 @@
 
 #include <xercesc/sax/SAXException.hpp>
 
-#include <xercesc/framework/StdOutFormatTarget.hpp>
-#include <xercesc/framework/LocalFileFormatTarget.hpp>
 #include <xercesc/framework/StdOutFormatTarget.hpp>
 #include <xercesc/framework/LocalFileFormatTarget.hpp>
 
 #include <xercesc/util/XMLUni.hpp>
 #include <xercesc/util/PlatformUtils.hpp>
-#include <xercesc/util/XMLUni.hpp>
 #include <xercesc/util/OutOfMemoryException.hpp>
-#include <xercesc/util/PlatformUtils.hpp>
 #include <xercesc/util/TransService.hpp>
 
-//#include <xercesc/parsers/XercesDOMParser.hpp>
-
 #include <ctime>
 #include <stdexcept>
 
diff --git a/Database/APR/CollectionUtilities/src/QueryInfo.cpp b/Database/APR/CollectionUtilities/src/QueryInfo.cpp
index 126a452f8d6b06c622901ce06eb8d0b482eed861..c4242d03a97d7a9e8d9e7ed74a3c923537ccb42b 100644
--- a/Database/APR/CollectionUtilities/src/QueryInfo.cpp
+++ b/Database/APR/CollectionUtilities/src/QueryInfo.cpp
@@ -16,8 +16,6 @@
 #include "CollectionBase/CollectionFactory.h"
 
 #include "CollectionBase/ICollectionQuery.h"
-#include "CollectionBase/ICollectionCursor.h"
-#include "CollectionBase/CollectionRowBuffer.h"
 #include "CoralBase/Attribute.h"
 
 #include "POOLCore/Exception.h"
diff --git a/Database/APR/CollectionUtilities/utilities/CollListMetadata.cpp b/Database/APR/CollectionUtilities/utilities/CollListMetadata.cpp
index d3e490ced4d0eab560ec5031b857f25ea8573d07..ce65f24894b7a3aec88156c6c48c8a9f23ef9bba 100644
--- a/Database/APR/CollectionUtilities/utilities/CollListMetadata.cpp
+++ b/Database/APR/CollectionUtilities/utilities/CollListMetadata.cpp
@@ -30,16 +30,12 @@
  
 #include <xercesc/sax/SAXException.hpp> 
  
-#include <xercesc/framework/StdOutFormatTarget.hpp> 
-#include <xercesc/framework/LocalFileFormatTarget.hpp> 
 #include <xercesc/framework/StdOutFormatTarget.hpp> 
 #include <xercesc/framework/LocalFileFormatTarget.hpp> 
          
 #include <xercesc/util/XMLUni.hpp> 
 #include <xercesc/util/PlatformUtils.hpp> 
-#include <xercesc/util/XMLUni.hpp> 
 #include <xercesc/util/OutOfMemoryException.hpp> 
-#include <xercesc/util/PlatformUtils.hpp> 
 #include <xercesc/util/TransService.hpp> 
 
 XERCES_CPP_NAMESPACE_USE 
diff --git a/Database/AthenaPOOL/AtlasCollectionTools/src/CollSplitByRun.cxx b/Database/AthenaPOOL/AtlasCollectionTools/src/CollSplitByRun.cxx
index 07f309cf53263476d8db94861649a60bdbb3cb90..4a2af7be12d0d4f03e5cdd872ae80b257819b379 100755
--- a/Database/AthenaPOOL/AtlasCollectionTools/src/CollSplitByRun.cxx
+++ b/Database/AthenaPOOL/AtlasCollectionTools/src/CollSplitByRun.cxx
@@ -45,7 +45,6 @@
 #include "POOLCollectionTools/CatalogInfo.h"
 #include "POOLCollectionTools/UtilityFuncs.h"
 
-#include "CoralBase/MessageStream.h"
 #include "StorageSvc/DbStatus.h"
 
 #include <iostream>
diff --git a/Database/AthenaRoot/AthenaRootComps/src/xAODEventSelector.cxx b/Database/AthenaRoot/AthenaRootComps/src/xAODEventSelector.cxx
index 4860a19f06c2e0e155ff596eff702f4796b6ffa6..2a5455163e4a647cec80447f2c6b2594f103578d 100644
--- a/Database/AthenaRoot/AthenaRootComps/src/xAODEventSelector.cxx
+++ b/Database/AthenaRoot/AthenaRootComps/src/xAODEventSelector.cxx
@@ -27,7 +27,6 @@
 #include "Gaudi/Property.h"
 
 // Framework includes
-//#include "GaudiKernel/GenericAddress.h"
 #include "GaudiKernel/FileIncident.h"
 #include "GaudiKernel/IIoComponentMgr.h"
 #include "GaudiKernel/ISvcLocator.h"
@@ -62,11 +61,7 @@
 // xAOD include(s):
 #include "xAODRootAccess/Init.h"
 
-//#include "xAODRootAccess/TEvent.h"
-//#include "AsgTools/SgTEvent.h"
-
 #include "GaudiKernel/ServiceHandle.h"
-#include "AthenaKernel/IClassIDSvc.h"
 #include "AthenaKernel/IProxyProviderSvc.h"
 #include <map>
 
diff --git a/Database/CoolConvUtilities/src/AtlCoolCopy.cxx b/Database/CoolConvUtilities/src/AtlCoolCopy.cxx
index 5e34ed8a26a4a95a77586b361cb43c3b3f319afd..6dcf1e9b3968a818b6d973028fa56d59239af71e 100755
--- a/Database/CoolConvUtilities/src/AtlCoolCopy.cxx
+++ b/Database/CoolConvUtilities/src/AtlCoolCopy.cxx
@@ -25,7 +25,6 @@
 #include "CoolKernel/IFolderSet.h"
 #include "CoolKernel/IObject.h"
 #include "CoolKernel/IObjectIterator.h"
-#include "CoolKernel/Exception.h"
 #include "CoolKernel/IRecordIterator.h"
 #include "CoolApplication/Application.h"
 #include "CoralBase/AttributeListException.h"
diff --git a/Database/FileStager/src/FileStagerAlg.cxx b/Database/FileStager/src/FileStagerAlg.cxx
index e55b95c23be7a939d3ff17f1da97ab38bac1f161..1d69c49e01bd547c1cd5fe4180f0ddc58c45fcdf 100644
--- a/Database/FileStager/src/FileStagerAlg.cxx
+++ b/Database/FileStager/src/FileStagerAlg.cxx
@@ -18,7 +18,6 @@
 #include <TTree.h>
 #include <TStopwatch.h>
 #include <TH1D.h>
-#include <TFile.h>
 
 FileStagerAlg::FileStagerAlg(const std::string& name, ISvcLocator* pSvcLocator) 
  : Algorithm(name, pSvcLocator)
diff --git a/Database/TPTools/TPTools/ITPConverter.h b/Database/TPTools/TPTools/ITPConverter.h
index 780244d387eba4ad309479ce027637085b06bbe9..f575dc5b5d88bfca1c1c6f00fd49e16f988f9b08 100644
--- a/Database/TPTools/TPTools/ITPConverter.h
+++ b/Database/TPTools/TPTools/ITPConverter.h
@@ -103,7 +103,6 @@ public:
 
 //--------------  TPConverterTypeMap<CONVERTER_BASE>  -------------
 #include <map>
-#include <typeinfo>
 
 /** class TPConverterTypeMap
     Converter registry template: a map from type_info to the appropriate converter.
diff --git a/Event/ByteStreamCnvSvc/test/AtlCopyBSEvent.cxx b/Event/ByteStreamCnvSvc/test/AtlCopyBSEvent.cxx
index d7a84c2507e71f66d942dfd544bffa6153713fa5..462be7a87eb5deab2c24e613d9ad350f6811e756 100644
--- a/Event/ByteStreamCnvSvc/test/AtlCopyBSEvent.cxx
+++ b/Event/ByteStreamCnvSvc/test/AtlCopyBSEvent.cxx
@@ -15,7 +15,6 @@
 #include <memory>
 #include <string>
 #include <fstream>
-#include <sstream>
 #include <vector>
 #include <algorithm>
 
diff --git a/Event/ByteStreamCnvSvcLegacy/src/offline_EventStorage/v5_ESCompression.h b/Event/ByteStreamCnvSvcLegacy/src/offline_EventStorage/v5_ESCompression.h
index 36d8eb17e7108a2b7e9628b8621258a0620d45af..19e7117428a5296278b698d3f71fc9684d0f2675 100644
--- a/Event/ByteStreamCnvSvcLegacy/src/offline_EventStorage/v5_ESCompression.h
+++ b/Event/ByteStreamCnvSvcLegacy/src/offline_EventStorage/v5_ESCompression.h
@@ -11,7 +11,6 @@
 #include <string>
 #include <sys/uio.h>
 #include "ers/ers.h"
-#include <string>
 
 #include "ByteStreamCnvSvcLegacy/offline_EventStorage/v5_EventStorageRecords.h"
 
diff --git a/Event/EventContainers/src/InternalOnline.cxx b/Event/EventContainers/src/InternalOnline.cxx
index 40754f370dd682beb9e65ead0a2d890ec25e35e1..fa7498764e82c93a8f9641b4a170a30e60b4fc3d 100644
--- a/Event/EventContainers/src/InternalOnline.cxx
+++ b/Event/EventContainers/src/InternalOnline.cxx
@@ -7,7 +7,6 @@
 #include "EventContainers/IDC_WriteHandleBase.h"
 #include "CxxUtils/AthUnlikelyMacros.h"
 #include "EventContainers/IdentifiableCacheBase.h"
-#include "CxxUtils/AthUnlikelyMacros.h"
 
 using namespace EventContainers;
 typedef I_InternalIDC::InternalConstItr InternalConstItr;
diff --git a/Event/EventInfoMgt/EventInfoMgt/ITagInfoMgr.h b/Event/EventInfoMgt/EventInfoMgt/ITagInfoMgr.h
index 1c49d0d24615cc06a808a780853562313a2b335c..d6f68f16d68fc5a6b0dc9ffd907cd004c2c7a962 100755
--- a/Event/EventInfoMgt/EventInfoMgt/ITagInfoMgr.h
+++ b/Event/EventInfoMgt/EventInfoMgt/ITagInfoMgr.h
@@ -20,7 +20,6 @@
 #include "GaudiKernel/Service.h"
 #include "GaudiKernel/IIncidentListener.h"
 #include "AthenaKernel/IAddressProvider.h"
-#include "AthenaKernel/IOVSvcDefs.h"
 
 
 //<<<<<< CLASS DECLARATIONS                                             >>>>>>
diff --git a/Event/FourMomUtils/FourMomUtils/P4Helpers.h b/Event/FourMomUtils/FourMomUtils/P4Helpers.h
index 4a4402a3f9520be5da81b8ddfb669ccb68716be4..d7ef01a25423350b11769a4564e8362e129d9cdb 100644
--- a/Event/FourMomUtils/FourMomUtils/P4Helpers.h
+++ b/Event/FourMomUtils/FourMomUtils/P4Helpers.h
@@ -37,7 +37,6 @@ namespace P4Helpers
 
 
 // STL includes
-#include <cmath>
 #include <algorithm> // for std::sort
 #include <limits>    // for std::numeric_limits
 
diff --git a/Event/xAOD/xAODCore/xAODCore/ShallowCopy.h b/Event/xAOD/xAODCore/xAODCore/ShallowCopy.h
index b47ba572c78dbf6f4f89e9049e08ba5f818b6c87..ff9dfa596afe148402f3c3aa20ebdf9497bc05ac 100644
--- a/Event/xAOD/xAODCore/xAODCore/ShallowCopy.h
+++ b/Event/xAOD/xAODCore/xAODCore/ShallowCopy.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: ShallowCopy.h 766390 2016-08-04 11:18:59Z wlampl $
@@ -48,6 +48,10 @@ namespace xAOD {
    /// @returns A pair of pointers to the created objects. The caller takes
    ///          ownership of the created objects
    ///
+   /// Be aware: If CONT has decorations, then the scheduler won't automatically
+   /// known that they are available on the copy.  To make that happen, see
+   /// StoreGate/ShallowCopyDecorDeps.h.
+   ///
    template< class T >
    std::pair< T*, ShallowAuxContainer* > shallowCopyContainer( const T& cont ) {
 
@@ -97,6 +101,10 @@ namespace xAOD {
    /// @returns A pair of pointers to the created objects. The caller takes
    ///          ownership of the created objects
    ///
+   /// Be aware: If CONT has decorations, then the scheduler won't automatically
+   /// known that they are available on the copy.  To make that happen, see
+   /// StoreGate/ShallowCopyDecorDeps.h.
+   ///
    template< class T >
    std::pair< T*, ShallowAuxInfo* > shallowCopyObject( const T& obj ) {
 
diff --git a/Event/xAOD/xAODTracking/xAODTracking/versions/Vertex_v1.h b/Event/xAOD/xAODTracking/xAODTracking/versions/Vertex_v1.h
index d3156ccf94ee6c9cd870d6f2c5f34850e902463e..ee71bebc05ff37e4db2fec7f3cc0288bc72dd527 100644
--- a/Event/xAOD/xAODTracking/xAODTracking/versions/Vertex_v1.h
+++ b/Event/xAOD/xAODTracking/xAODTracking/versions/Vertex_v1.h
@@ -29,9 +29,6 @@
 #include "xAODTracking/NeutralParticleContainer.h"
 #include "xAODBase/ObjectType.h"
 
-// Local include(s):
-#include "xAODTracking/TrackingPrimitives.h"
-
 //MT CachedValue
 #include "CxxUtils/CachedValue.h"
 
diff --git a/HLT/Trigger/TrigControl/TrigPSC/src/Psc.cxx b/HLT/Trigger/TrigControl/TrigPSC/src/Psc.cxx
index fb3b3d883960761eb81fe1a27d28f3e5593a25e0..f25ed2f26f4ec43c0252eebdff403850a09839e0 100644
--- a/HLT/Trigger/TrigControl/TrigPSC/src/Psc.cxx
+++ b/HLT/Trigger/TrigControl/TrigPSC/src/Psc.cxx
@@ -44,8 +44,6 @@
 
 #include <boost/property_tree/xml_parser.hpp>
 
-#include "CxxUtils/checker_macros.h"
-
 using namespace boost::property_tree;
 
 namespace
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/CMakeLists.txt b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/CMakeLists.txt
index ea2bc8b58e8e04b3e89b4bff131503dc6f44d2df..a1fd60f379afcf1eb57fb07908d647421cb3841f 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/CMakeLists.txt
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/CMakeLists.txt
@@ -90,9 +90,18 @@ atlas_add_test( TestConfigNewConf
 atlas_add_test( TestDCSConditionsNewConf
                 SCRIPT python -m SCT_ConditionsAlgorithms.SCT_DCSConditionsTestAlgConfig
                 PROPERTIES TIMEOUT 600 )
+atlas_add_test( TestMajorityNewConf
+                SCRIPT python -m SCT_ConditionsAlgorithms.SCT_MajorityConditionsTestAlgConfig
+                PROPERTIES TIMEOUT 600 )
 atlas_add_test( TestMonReadNewConf
                 SCRIPT python -m SCT_ConditionsAlgorithms.SCT_MonitorConditionsTestAlgConfig
                 PROPERTIES TIMEOUT 600 )
+atlas_add_test( TestRodVetoNewConf
+                SCRIPT python -m SCT_ConditionsAlgorithms.SCT_RODVetoTestAlgConfig
+                PROPERTIES TIMEOUT 600 )
+atlas_add_test( TestStripVetoNewConf
+                SCRIPT python -m SCT_ConditionsAlgorithms.SCT_StripVetoTestAlgConfig
+                PROPERTIES TIMEOUT 600 )
 atlas_add_test( TestSummaryNewConf
                 SCRIPT python -m SCT_ConditionsAlgorithms.SCT_ConditionsSummaryTestAlgConfig
                 PROPERTIES TIMEOUT 600 )
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_MajorityConditionsTestAlgConfig.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_MajorityConditionsTestAlgConfig.py
new file mode 100644
index 0000000000000000000000000000000000000000..5dc62a8bb0ea0ba5eccbd9ecf7c4ecc8379b2a2a
--- /dev/null
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_MajorityConditionsTestAlgConfig.py
@@ -0,0 +1,42 @@
+"""Define method to configure and test SCT_MajorityConditionsTestAlg
+
+Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+"""
+from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+from AthenaConfiguration.ComponentFactory import CompFactory
+
+def SCT_MajorityConditionsTestAlgCfg(flags, name="SCT_MajorityConditionsTestAlg", **kwargs):
+    """Return a configured SCT_MajorityConditionsTestAlg"""
+    acc = ComponentAccumulator()
+    from SCT_ConditionsTools.SCT_MajorityConditionsConfig import SCT_MajorityConditionsCfg
+    kwargs.setdefault("MajorityTool", acc.popToolsAndMerge(SCT_MajorityConditionsCfg(flags)))
+    acc.addEventAlgo(CompFactory.SCT_MajorityConditionsTestAlg(**kwargs))
+    return acc
+
+if __name__=="__main__":
+    from AthenaCommon.Logging import log
+    from AthenaCommon.Constants import INFO
+    log.setLevel(INFO)
+
+    from AthenaCommon.Configurable import Configurable
+    Configurable.configurableRun3Behavior=1
+    
+    from AthenaConfiguration.AllConfigFlags import ConfigFlags
+    ConfigFlags.Input.isMC = False
+    ConfigFlags.Input.ProjectName = "data16_13TeV"
+    ConfigFlags.Input.RunNumber = 310809
+    ConfigFlags.addFlag("Input.InitialTimeStamp", 1476741326) # LB 18 of run 310809, 10/17/2016 @ 9:55pm (UTC)
+    ConfigFlags.IOVDb.GlobalTag = "CONDBR2-BLKPA-2017-06"
+    ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2016-01-00-01"
+    ConfigFlags.Detector.GeometrySCT = True
+    ConfigFlags.lock()
+
+    from AthenaConfiguration.MainServicesConfig import MainServicesCfg
+    cfg = MainServicesCfg(ConfigFlags)
+
+    from McEventSelector.McEventSelectorConfig import McEventSelectorCfg
+    cfg.merge(McEventSelectorCfg(ConfigFlags))
+
+    cfg.merge(SCT_MajorityConditionsTestAlgCfg(ConfigFlags))
+
+    cfg.run(maxEvents=20)
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_RODVetoTestAlgConfig.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_RODVetoTestAlgConfig.py
new file mode 100644
index 0000000000000000000000000000000000000000..7416073803c19eddbd0d027ceb01ad909601c564
--- /dev/null
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_RODVetoTestAlgConfig.py
@@ -0,0 +1,45 @@
+"""Define method to configure and test SCT_RODVetoTestAlg
+
+Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+"""
+from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+from AthenaConfiguration.ComponentFactory import CompFactory
+
+def SCT_RODVetoTestAlgCfg(flags, name="SCT_RODVetoTestAlg", **kwargs):
+    """Return a configured SCT_RODVetoTestAlg"""
+    acc = ComponentAccumulator()
+    from SCT_ConditionsTools.SCT_RODVetoConfig import SCT_RODVetoCfg
+    algArgs = {}
+    algArgs["SCT_RODVetoTool"] = acc.popToolsAndMerge(SCT_RODVetoCfg(flags, **kwargs))
+    acc.addEventAlgo(CompFactory.SCT_RODVetoTestAlg(**algArgs))
+    return acc
+
+if __name__=="__main__":
+    from AthenaCommon.Logging import log
+    from AthenaCommon.Constants import INFO
+    log.setLevel(INFO)
+
+    from AthenaCommon.Configurable import Configurable
+    Configurable.configurableRun3Behavior=1
+    
+    from AthenaConfiguration.AllConfigFlags import ConfigFlags
+    ConfigFlags.Input.isMC = True
+    ConfigFlags.Input.ProjectName = "mc16_13TeV"
+    ConfigFlags.Input.RunNumber = 300000 # MC16c 2017 run number
+    ConfigFlags.addFlag("Input.InitialTimeStamp", 1500000000)
+    ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-18"
+    ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2015-03-01-00"
+    ConfigFlags.Detector.GeometrySCT = True
+    ConfigFlags.lock()
+
+    from AthenaConfiguration.MainServicesConfig import MainServicesCfg
+    cfg = MainServicesCfg(ConfigFlags)
+
+    from McEventSelector.McEventSelectorConfig import McEventSelectorCfg
+    cfg.merge(McEventSelectorCfg(ConfigFlags))
+
+    kwargs = {}
+    kwargs["BadRODIds"] = [0x240100, 0x240030] # RODs to be vetoed
+    cfg.merge(SCT_RODVetoTestAlgCfg(ConfigFlags, **kwargs))
+
+    cfg.run(maxEvents=20)
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_StripVetoTestAlgConfig.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_StripVetoTestAlgConfig.py
new file mode 100644
index 0000000000000000000000000000000000000000..56ff2c2cc52b6f2d77739f5c580012727f9937fd
--- /dev/null
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_StripVetoTestAlgConfig.py
@@ -0,0 +1,42 @@
+"""Define method to configure and test SCT_StripVetoTestAlg
+
+Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+"""
+from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+from AthenaConfiguration.ComponentFactory import CompFactory
+
+def SCT_StripVetoTestAlgCfg(flags, name="SCT_StripVetoTestAlg", **kwargs):
+    """Return a configured SCT_SiliconConditionsTestAlg"""
+    acc = ComponentAccumulator()
+    from SCT_ConditionsTools.SCT_StripVetoConfig import SCT_StripVetoCfg
+    kwargs.setdefault("StripVetoTool", acc.popToolsAndMerge(SCT_StripVetoCfg(flags)))
+    acc.addEventAlgo(CompFactory.SCT_StripVetoTestAlg(name=name, **kwargs))
+    return acc
+
+if __name__=="__main__":
+    from AthenaCommon.Logging import log
+    from AthenaCommon.Constants import INFO
+    log.setLevel(INFO)
+
+    from AthenaCommon.Configurable import Configurable
+    Configurable.configurableRun3Behavior=1
+    
+    from AthenaConfiguration.AllConfigFlags import ConfigFlags
+    ConfigFlags.Input.isMC = True
+    ConfigFlags.Input.ProjectName = "mc16_13TeV"
+    ConfigFlags.Input.RunNumber = 300000 # MC16c 2017 run number
+    ConfigFlags.addFlag("Input.InitialTimeStamp", 1500000000) # MC16c 2017 time stamp
+    ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-18"
+    ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2015-03-01-00"
+    ConfigFlags.Detector.GeometrySCT = True
+    ConfigFlags.lock()
+
+    from AthenaConfiguration.MainServicesConfig import MainServicesCfg
+    cfg = MainServicesCfg(ConfigFlags)
+
+    from McEventSelector.McEventSelectorConfig import McEventSelectorCfg
+    cfg.merge(McEventSelectorCfg(ConfigFlags))
+
+    cfg.merge(SCT_StripVetoTestAlgCfg(ConfigFlags))
+
+    cfg.run(maxEvents=20)
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/python/SCT_MajorityConditionsConfig.py b/InnerDetector/InDetConditions/SCT_ConditionsTools/python/SCT_MajorityConditionsConfig.py
new file mode 100644
index 0000000000000000000000000000000000000000..0d16a135d517bc1def9125045235d9f177b738a6
--- /dev/null
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/python/SCT_MajorityConditionsConfig.py
@@ -0,0 +1,26 @@
+"""Define methods to configure SCT_MajorityConditions
+
+Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+"""
+from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+from AthenaConfiguration.ComponentFactory import CompFactory
+from IOVDbSvc.IOVDbSvcConfig import addFolders
+
+def SCT_MajorityConditionsCfg(flags, name="InDetSCT_MajorityConditions", **kwargs):
+    """Configure necessary condition folder, condition algorithm
+       for SCT_MajorityConditionsTool and return it.
+    """
+    acc = ComponentAccumulator()
+
+    # Condition folder
+    folder = "/SCT/DCS/MAJ"
+    dbInstance = "DCS_OFL"
+    
+    # Condition algorithm
+    acc.merge(addFolders(flags, folder, dbInstance, className="CondAttrListCollection"))
+    acc.addCondAlgo(CompFactory.SCT_MajorityCondAlg())
+
+    # Condition tool
+    acc.setPrivateTools(CompFactory.SCT_MajorityConditionsTool(name=name+"Tool"))
+
+    return acc
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/python/SCT_RODVetoConfig.py b/InnerDetector/InDetConditions/SCT_ConditionsTools/python/SCT_RODVetoConfig.py
new file mode 100644
index 0000000000000000000000000000000000000000..86b62b2f39eaca55cb76aea6460750b8b6773e39
--- /dev/null
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/python/SCT_RODVetoConfig.py
@@ -0,0 +1,29 @@
+"""Define methods to configure SCT_RODVeto
+
+Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+"""
+from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+from AthenaConfiguration.ComponentFactory import CompFactory
+from AtlasGeoModel.GeoModelConfig import GeoModelCfg
+from InDetConfig.InDetRecToolConfig import SCT_CablingToolCfg
+
+def SCT_RODVetoCfg(flags, name="SCT_RODVeto", **kwargs):
+    """Configure necessary condition folders, condition algorithms 
+       for SCT_DCSConditionsTool and return it.
+    """
+    acc = ComponentAccumulator()
+
+    # For SCT_ID used in SCT_RODVetoCondAlg and SCT_RODVetoTool
+    acc.merge(GeoModelCfg(flags))
+
+    # For SCT_CablingTool used in SCT_RODVetoCondAlg
+    kwargs.setdefault("SCT_CablingTool", acc.popToolsAndMerge(SCT_CablingToolCfg(flags)))
+
+    # Condition algorithm (actually event algorithm)
+    alg = CompFactory.SCT_RODVetoCondAlg(name=name+"CondAlg", **kwargs)
+    acc.addEventAlgo(alg)
+
+    # Condition tool
+    acc.setPrivateTools(CompFactory.SCT_RODVetoTool(name=name+"Tool"))
+
+    return acc
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/python/SCT_StripVetoConfig.py b/InnerDetector/InDetConditions/SCT_ConditionsTools/python/SCT_StripVetoConfig.py
new file mode 100644
index 0000000000000000000000000000000000000000..3bfbd151ac6f14c4bea30c1b34e966f3f8a91b9c
--- /dev/null
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/python/SCT_StripVetoConfig.py
@@ -0,0 +1,29 @@
+"""Define methods to configure SCT_StripVetoTool
+
+Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+"""
+from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+from AthenaConfiguration.ComponentFactory import CompFactory
+from AtlasGeoModel.GeoModelConfig import GeoModelCfg
+
+def SCT_StripVetoCfg(flags, name="SCT_StripVeto", **kwargs):
+    """Return a ComponentAccumulator configured for SCT_StripVetoTool
+    """
+    acc = ComponentAccumulator()
+
+    # For SCT_ID used in SCT_StripVetoTool
+    acc.merge(GeoModelCfg(flags))
+
+    # Condition tool
+    # Identifiers should be given as strings and decimal.
+    # Identifier::compact() method returns unsigned long long.
+    kwargs.setdefault("BadStripIdentifiers", ["576522359582752768",
+                                              "576522475009998848",
+                                              "576522475278434304",
+                                              # "576522475546869760",
+                                              # "576522475815305216",
+                                              # "576522476083740672",
+                                             ])
+    acc.setPrivateTools(CompFactory.SCT_StripVetoTool(name=name+"Tool", **kwargs))
+
+    return acc
diff --git a/LArCalorimeter/LArG4/LArG4FastSimulation/src/LArFastShowerTool.h b/LArCalorimeter/LArG4/LArG4FastSimulation/src/LArFastShowerTool.h
index 88a951f42271bc0997357cab576f8bf721f9d76d..81697a3ac1c51c218797c1f8a1e8f806c0b8b8bb 100644
--- a/LArCalorimeter/LArG4/LArG4FastSimulation/src/LArFastShowerTool.h
+++ b/LArCalorimeter/LArG4/LArG4FastSimulation/src/LArFastShowerTool.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef LARG4FASTSIMULATION_LARFASTSHOWERTOOL_H
@@ -16,8 +16,6 @@
 // STL headers
 #include <string>
 
-class G4FastSimulationModel;
-
 /// NEEDS DOCUMENTATION
 class LArFastShowerTool: public FastSimulationBase
 {
diff --git a/LumiBlock/LumiCalc/LumiCalc/CoolQuery.h b/LumiBlock/LumiCalc/LumiCalc/CoolQuery.h
index b59d75a04ac477db1afeba8a22b69df2cae68c34..3f86f363e04073575b2a337578b66f3e4531a6b3 100644
--- a/LumiBlock/LumiCalc/LumiCalc/CoolQuery.h
+++ b/LumiBlock/LumiCalc/LumiCalc/CoolQuery.h
@@ -14,9 +14,7 @@
 #include "CoolKernel/IFolderSet.h"
 #include "CoolKernel/IObject.h"
 #include "CoolKernel/IObjectIterator.h"
-#include "CoolKernel/Exception.h"
 #include "CoolKernel/pointers.h"
-#include "CoolKernel/IDatabaseSvc.h"
 #include "CoolApplication/DatabaseSvcFactory.h"
 #include "LumiCalc/ReplicaSorter.h"
 
@@ -45,15 +43,9 @@
 #include <vector>
 #include <map>
 
-// boost includes
-//#include <boost/unordered_map.hpp>
-
 // logger
 #include "GoodRunsLists/TMsgLogger.h"
 
-// magic includes
-//#include <magic.h>
-
 //================================================
 // Simple class to hold
 
diff --git a/MagneticField/MagFieldConditions/MagFieldConditions/AtlasFieldCacheCondObj.h b/MagneticField/MagFieldConditions/MagFieldConditions/AtlasFieldCacheCondObj.h
index 61e5be32d80b329fb1d83330a6713e884437dc26..895c203e2a189c37c88986ed0553d47758c77243 100644
--- a/MagneticField/MagFieldConditions/MagFieldConditions/AtlasFieldCacheCondObj.h
+++ b/MagneticField/MagFieldConditions/MagFieldConditions/AtlasFieldCacheCondObj.h
@@ -59,7 +59,6 @@ AtlasFieldCacheCondObj::getInitializedCache (MagField::AtlasFieldCache& cache) c
 
 #include "AthenaKernel/CLASS_DEF.h"
 CLASS_DEF( AtlasFieldCacheCondObj, 258146572, 1)
-#include "AthenaKernel/CondCont.h"
 CONDCONT_DEF (AtlasFieldCacheCondObj, 3622068);
 
 
diff --git a/MagneticField/MagFieldConditions/MagFieldConditions/AtlasFieldMapCondObj.h b/MagneticField/MagFieldConditions/MagFieldConditions/AtlasFieldMapCondObj.h
index 3f197a6bffc96a2303f60fdfc0dd4e9f6153c65b..458cefafeeb1f4601c45acfa7b5f0888125aa76b 100644
--- a/MagneticField/MagFieldConditions/MagFieldConditions/AtlasFieldMapCondObj.h
+++ b/MagneticField/MagFieldConditions/MagFieldConditions/AtlasFieldMapCondObj.h
@@ -30,7 +30,6 @@ private:
 
 #include "AthenaKernel/CLASS_DEF.h"
 CLASS_DEF( AtlasFieldMapCondObj, 122915602, 1)
-#include "AthenaKernel/CondCont.h"
 CONDCONT_DEF (AtlasFieldMapCondObj, 249359246);
 
 
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/share/NSWPRDValAlg.digi.py b/MuonSpectrometer/MuonValidation/MuonPRDTest/share/NSWPRDValAlg.digi.py
index 0538b88bf44f35fd2a4361cbcf1c47eeaf858340..3b9a71d29f57e4d5bb619a7a06c873d41e651127 100644
--- a/MuonSpectrometer/MuonValidation/MuonPRDTest/share/NSWPRDValAlg.digi.py
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/share/NSWPRDValAlg.digi.py
@@ -1,7 +1,8 @@
-#job options to activate the dump of the NSWPRDVal nTuple
-#This file can be used with Digi_tf by specifying --postinclude MuonPRDTest/NSWPRDValAlg.digi.py
-#It dumps Truth, MuEntry and Hits, Digits, SDOs and RDOs for MM and sTGC
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
+# jobOptions to activate the dump of the NSWPRDValAlg nTuple
+# This file can be used with Digi_tf by specifying --postInclude MuonPRDTest/NSWPRDValAlg.digi.py
+# It dumps Truth, MuEntry and Hits, Digits, SDOs and RDOs for MM and sTGC
 
 #-----------------------------------------------------------------------------
 # Algorithms
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/share/NSWPRDValAlg.reco.py b/MuonSpectrometer/MuonValidation/MuonPRDTest/share/NSWPRDValAlg.reco.py
index 91eada721c3cd21635020df9e16a340f2dee02e6..0fd541c00a35b61034e6b7ae53bdbb512b57867c 100644
--- a/MuonSpectrometer/MuonValidation/MuonPRDTest/share/NSWPRDValAlg.reco.py
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/share/NSWPRDValAlg.reco.py
@@ -1,8 +1,9 @@
-#job options to activate the dump of the NSWPRDVal nTuple
-#This file can be used with Reco_tf by specifying --postinclude MuonPRDTest/NSWPRDValAlg.reco.py
-#It dumps Truth, MuEntry and Hits, Digits, SDOs, RDOs and PRDs for MM and sTGC
-#It should only be used with Reco since the alg crashes in the absence of PRDs
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
+# jobOptions to activate the dump of the NSWPRDValAlg nTuple
+# This file can be used with Reco_tf by specifying --postInclude MuonPRDTest/NSWPRDValAlg.reco.py
+# It dumps Truth, MuEntry and Hits, Digits, SDOs, RDOs and PRDs for MM and sTGC
+# It should only be used with Reco since the alg crashes in the absence of PRDs
 
 #-----------------------------------------------------------------------------
 # Algorithms
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/share/NSWPRDValAlg.sim.py b/MuonSpectrometer/MuonValidation/MuonPRDTest/share/NSWPRDValAlg.sim.py
new file mode 100644
index 0000000000000000000000000000000000000000..e81dab998ed8b15dd1f2d84898aefe664bac5ea4
--- /dev/null
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/share/NSWPRDValAlg.sim.py
@@ -0,0 +1,30 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+# jobOptions to activate the dump of the NSWPRDValAlg nTuple
+# This file can be used with Sim_tf by specifying --postInclude MuonPRDTest/NSWPRDValAlg.sim.py
+# It dumps Truth, MuEntry and Hits, for MDT, RPC, MM and sTGC
+
+#-----------------------------------------------------------------------------
+# Algorithms
+#-----------------------------------------------------------------------------
+from AthenaCommon.AlgSequence import AlgSequence
+job = AlgSequence()
+from MuonPRDTest.MuonPRDTestConf import *
+
+job+=NSWPRDValAlg('NSWPRDValAlg', OutputLevel = WARNING)
+NSWPRDValAlg.OutputLevel = INFO
+NSWPRDValAlg.doTruth = True
+
+NSWPRDValAlg.doMuEntry = True
+
+NSWPRDValAlg.doMDTHit= True
+NSWPRDValAlg.doRPCHit= True
+NSWPRDValAlg.doMMHit = True
+NSWPRDValAlg.doSTGCHit = True
+
+#-----------------------------------------------------------------------------
+# save ROOT histograms and Tuple
+#-----------------------------------------------------------------------------
+from GaudiSvc.GaudiSvcConf import THistSvc
+ServiceMgr += THistSvc()
+ServiceMgr.THistSvc.Output = [ "NSWPRDValAlg DATAFILE='NSWPRDValAlg.sim.ntuple.root' OPT='RECREATE'" ]
diff --git a/PhysicsAnalysis/AnalysisCommon/AODSelect/CMakeLists.txt b/PhysicsAnalysis/AnalysisCommon/AODSelect/CMakeLists.txt
index 24e23726258436512f0881d6f12de531057c1a52..f7b7f31d1487f66e547d46765bc62f1f17c14e7c 100644
--- a/PhysicsAnalysis/AnalysisCommon/AODSelect/CMakeLists.txt
+++ b/PhysicsAnalysis/AnalysisCommon/AODSelect/CMakeLists.txt
@@ -1,12 +1,10 @@
-################################################################################
-# Package: AODSelect
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( AODSelect )
 
 # Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
 atlas_install_joboptions( share/*.py )
 atlas_install_scripts( share/PrintAODSelect.py )
 
diff --git a/PhysicsAnalysis/AnalysisCommon/AODSelect/python/AODSelectFlags.py b/PhysicsAnalysis/AnalysisCommon/AODSelect/python/AODSelectFlags.py
index 9d683fb4ba729c59e3cdae435196723bf876e06a..b3863c8962a6311d865c171eb923cc223ea220b4 100644
--- a/PhysicsAnalysis/AnalysisCommon/AODSelect/python/AODSelectFlags.py
+++ b/PhysicsAnalysis/AnalysisCommon/AODSelect/python/AODSelectFlags.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # =============================================================================
 # Name:        AODSelectFlags
@@ -17,7 +17,6 @@ __author__  = "Karsten Koeneke <karsten.koeneke@cern.ch>"
 
 from AthenaCommon.JobProperties import JobProperty, JobPropertyContainer
 from AthenaCommon.JobProperties import jobproperties
-from RecExConfig.RecoFunctions import AddValidItemToList,RemoveValidItemFromList
 
 # =====================================================================
 # First define container for the D2PDMaker flags  
@@ -111,19 +110,19 @@ class buildingBaseProperty(JobProperty):
     outputCollectionPrefix     = ""
     def add(self, inputItem="", createOutputCollection=None, createOutputLinkCollection=None ):
         if self.is_locked():
-            self._log.info('The JobProperty %s is blocked' % self.__name__)
+            self._log.info('The JobProperty %s is blocked', self.__name__)
         else:
             if inputItem != "":
                 if not self.inputTypeAndKeyList.__contains__(inputItem): self.inputTypeAndKeyList.append(inputItem)
-                if createOutputCollection!=None: self.createOutputCollection = createOutputCollection or self.createOutputCollection
-                if createOutputLinkCollection!=None: self.createOutputLinkCollection = createOutputLinkCollection or self.createOutputLinkCollection
+                if createOutputCollection is not None: self.createOutputCollection = createOutputCollection or self.createOutputCollection
+                if createOutputLinkCollection is not None: self.createOutputLinkCollection = createOutputLinkCollection or self.createOutputLinkCollection
                 if len(self.inputTypeAndKeyList)>0 and ( self.createOutputCollection or self.createOutputLinkCollection ):
                     self.StoredValue = True
                     AODSelectFlags.doAODSelect = True
                     pass
                 pass
             else:
-                self._log.warning('We got an empty inputItem string for the JobProperty %s... doing nothing!' % self.__name__)
+                self._log.warning('We got an empty inputItem string for the JobProperty %s... doing nothing!', self.__name__)
                 pass
             pass
         return
@@ -138,7 +137,7 @@ class flaggingBaseProperty(JobProperty):
     varNameList         = []
     def add(self, inputItem="", varNameList=[] ):
         if self.is_locked():
-            self._log.info('The JobProperty %s is blocked' % self.__name__)
+            self._log.info('The JobProperty %s is blocked', self.__name__)
         else:
             if inputItem != "":
                 self.StoredValue = True
@@ -151,7 +150,7 @@ class flaggingBaseProperty(JobProperty):
                     pass
                 pass
             else:
-                self._log.warning('We got an empty inputItem string for the JobProperty %s... doing nothing!' % self.__name__)
+                self._log.warning('We got an empty inputItem string for the JobProperty %s... doing nothing!', self.__name__)
                 pass
             pass
         return
@@ -167,25 +166,25 @@ class matchingBaseProperty(JobProperty):
     defaultMatchToItem = ""
     def add(self, inputItem="", matchToItemList=[], matchDistanceList=[] ):
         if self.is_locked():
-            self._log.info('The JobProperty %s is blocked' % self.__name__)
+            self._log.info('The JobProperty %s is blocked', self.__name__)
         else:
             if inputItem == "":
-                self._log.warning('We got an empty inputItem string for the JobProperty %s... doing nothing!' % self.__name__)
+                self._log.warning('We got an empty inputItem string for the JobProperty %s... doing nothing!', self.__name__)
                 return
             if len(matchToItemList)==0 and self.defaultMatchToItem == "" :
-                self._log.warning('We got an empty matchToItemList for the JobProperty %s... doing nothing!' % self.__name__)
+                self._log.warning('We got an empty matchToItemList for the JobProperty %s... doing nothing!', self.__name__)
                 return
             if len(matchToItemList)!=0 and len(matchDistanceList)!=0 and len(matchToItemList)!=len(matchDistanceList):
                 self._log.warning("We got non-empty lists with different lenght for the ",
-                                  "JobProperty %s... doing nothing! len(matchToItemList)=%s, len(matchDistanceList)=%s"
-                                  % (self.__name__, len(matchToItemList), len(matchDistanceList)) )
+                                  "JobProperty %s... doing nothing! len(matchToItemList)=%s, len(matchDistanceList)=%s",
+                                  self.__name__, len(matchToItemList), len(matchDistanceList) )
                 return
             # OK, we seem to have correct inputs... now, update the information
             self.StoredValue = True
             AODSelectFlags.doAODSelect = True
             # Prepare the final list of pairs of [ matchToItem, matchDistance ]
             finalMatchToItemList = []
-            for idx in xrange( len(matchToItemList) ):
+            for idx in range( len(matchToItemList) ):
                 matchToItem = matchToItemList[idx]
                 if len(matchDistanceList)==0 :
                     finalMatchToItemList.append( [matchToItem, self.defaultDeltaR] )
@@ -194,7 +193,7 @@ class matchingBaseProperty(JobProperty):
                     finalMatchToItemList.append( [matchToItem, matchDistanceList[idx]] )
                     pass
                 pass
-            if self.matchingDictionary.has_key(inputItem):
+            if inputItem in self.matchingDictionary:
                 valueList = self.matchingDictionary[inputItem]
                 for newPair in finalMatchToItemList:
                     if not valueList.__contains__(newPair):
diff --git a/PhysicsAnalysis/AnalysisCommon/AODSelect/python/AODSelectHelpers.py b/PhysicsAnalysis/AnalysisCommon/AODSelect/python/AODSelectHelpers.py
index 3fb07777b55d299ec23c62f3ec878f670d9ef991..57ccbe1ab5c0e46b39d20f57a9abeff10b8b1ecd 100644
--- a/PhysicsAnalysis/AnalysisCommon/AODSelect/python/AODSelectHelpers.py
+++ b/PhysicsAnalysis/AnalysisCommon/AODSelect/python/AODSelectHelpers.py
@@ -21,8 +21,6 @@ from AthenaCommon.Logging import logging
 logAODSelect_helpers = logging.getLogger( 'AODSelect_helpers' )
 #logAODSelect_helpers.setLevel(logging.DEBUG)
 
-# Import the AODSelectFlags to steer the job
-from AODSelect.AODSelectFlags import AODSelectFlags
 from AthenaCommon import CfgMgr
 
 # Import the objKeyStore to be able to see what collections are available
@@ -73,10 +71,10 @@ class AODSelectConfiguration(object):
         if not aodSelectFlag:
             logAODSelect_helpers.warning( "You gave me an empty flag container... this won't work!" )
             return False
-        logAODSelect_helpers.debug( "Have inputTypeAndKeyList=%s, outputCollectionPrefix=%s, createOutputCollection=%s, createOutputLinkCollection=%s, selectorTool=%s "
-                                    % (aodSelectFlag.inputTypeAndKeyList,
+        logAODSelect_helpers.debug( "Have inputTypeAndKeyList=%s, outputCollectionPrefix=%s, createOutputCollection=%s, createOutputLinkCollection=%s, selectorTool=%s ",
+                                       aodSelectFlag.inputTypeAndKeyList,
                                        aodSelectFlag.outputCollectionPrefix, aodSelectFlag.createOutputCollection,
-                                       aodSelectFlag.createOutputLinkCollection, selectorTool ) )
+                                       aodSelectFlag.createOutputLinkCollection, selectorTool )
         for inputTypeAndKey in aodSelectFlag.inputTypeAndKeyList:
             # Prepare the names for this inputTypeAndKey
             inputType, inputKey = inputTypeAndKey.split("#")
@@ -93,10 +91,10 @@ class AODSelectConfiguration(object):
                 algConfigName = inputTypeAndKey
                 if index > 0: algConfigName = algConfigName + ("_%s" % index)
                 algConfig = self.findAlgConfig(algConfigName)
-                if algConfig != None:
+                if algConfig is not None:
                     # Check if it already has output (link) collections scheduled
                     if algConfig.outputCollection == algConfig.outputLinkCollection == "":
-                        logAODSelect_helpers.debug( "Modifying an existing AODSelectAlgConfig with name: %s" % algConfigName )
+                        logAODSelect_helpers.debug( "Modifying an existing AODSelectAlgConfig with name: %s", algConfigName )
                         algConfig.selectorToolList.append(selectorTool)
                         algConfig.outputCollection     = outCollKey
                         algConfig.outputLinkCollection = outLinkCollKey
@@ -110,7 +108,7 @@ class AODSelectConfiguration(object):
                     pass
                 else:
                     # Create a new one and add it
-                    logAODSelect_helpers.debug( "Adding a new AODSelectAlgConfig with name: %s" % algConfigName )
+                    logAODSelect_helpers.debug( "Adding a new AODSelectAlgConfig with name: %s", algConfigName )
                     algConfig = AODSelectAlgConfig(algConfigName)
                     algConfig.setInputTypeAndKey(inputTypeAndKey)
                     algConfig.selectorToolList.append(selectorTool)
@@ -144,18 +142,17 @@ class AODSelectConfiguration(object):
             return False
         for inputTypeAndKey in aodSelectFlag.inputTypeAndKeyList:
             algConfig = self.findAlgConfig(inputTypeAndKey)
-            if algConfig == None:
+            if algConfig is None:
                 # Create a new one and add it
-                logAODSelect_helpers.debug( "Adding a new AODSelectAlgConfig with name: %s" % inputTypeAndKey )
+                logAODSelect_helpers.debug( "Adding a new AODSelectAlgConfig with name: %s", inputTypeAndKey )
                 algConfig = AODSelectAlgConfig(inputTypeAndKey)
-                logAODSelect_helpers.debug( "Adding a new user data tool: %s" % userDataTool )
+                logAODSelect_helpers.debug( "Adding a new user data tool: %s", userDataTool )
                 algConfig.userDataToolList.append(userDataTool)
                 if logAODSelect_helpers.isEnabledFor(logging.DEBUG): algConfig.doPrint()
                 self.addAlgConfig(algConfig)
                 pass
             else:
-                logAODSelect_helpers.debug( "Adding a new user data tool of name %s to AODSelectAlgConfig with name: %s"
-                                            % (userDataTool, inputTypeAndKey) )
+                logAODSelect_helpers.debug( "Adding a new user data tool of name %s to AODSelectAlgConfig with name: %s", userDataTool, inputTypeAndKey )
                 algConfig.userDataToolList.append(userDataTool)
                 if logAODSelect_helpers.isEnabledFor(logging.DEBUG): algConfig.doPrint()
                 pass
@@ -181,7 +178,7 @@ class AODSelectConfiguration(object):
             logAODSelect_helpers.warning( "You gave me an empty inputTypeAndKey string... this won't work!" )
             return False
         if not inputTypeAndKey.__contains__("#"):
-            logAODSelect_helpers.warning( "The inputTypeAndKey string doesn't contain a '#', but it should: %s" % inputTypeAndKey )
+            logAODSelect_helpers.warning( "The inputTypeAndKey string doesn't contain a '#', but it should: %s", inputTypeAndKey )
             return False
         if not associationTool:
             logAODSelect_helpers.warning( "You gave me an empty associationTool... this won't work!" )
@@ -189,19 +186,19 @@ class AODSelectConfiguration(object):
         # Create the name of the associationMap container that will be created
         _tmpName = ((associationTool.getName()).split("__"))[-1]
         _outAssoName = (inputTypeAndKey.split("#"))[1] + "_MatchTo_" + _tmpName
-        logAODSelect_helpers.debug( "using inputTypeAndKey=%s, _tmpName=%s, _outAssoName=%s" % (inputTypeAndKey, _tmpName, _outAssoName ) )
+        logAODSelect_helpers.debug( "using inputTypeAndKey=%s, _tmpName=%s, _outAssoName=%s", inputTypeAndKey, _tmpName, _outAssoName )
         # Find the right AODSelectAlgConfig object
         algConfig = self.findAlgConfig(inputTypeAndKey)
-        if algConfig == None:
+        if algConfig is None:
             # Create a new one and add it
-            logAODSelect_helpers.debug( "Creating a new AODSelectAlgConfig with name=%s" % (inputTypeAndKey) )
+            logAODSelect_helpers.debug( "Creating a new AODSelectAlgConfig with name=%s", inputTypeAndKey )
             algConfig = AODSelectAlgConfig(inputTypeAndKey)
             algConfig.associationToolList.append(associationTool)
             algConfig.outputAssociationList.append(_outAssoName)
             self.addAlgConfig(algConfig)
             pass
         else:
-            logAODSelect_helpers.debug( "Using an existing AODSelectAlgConfig with name=%s" % (inputTypeAndKey) )
+            logAODSelect_helpers.debug( "Using an existing AODSelectAlgConfig with name=%s", inputTypeAndKey )
             algConfig.associationToolList.append(associationTool)
             algConfig.outputAssociationList.append(_outAssoName)
             pass
@@ -235,7 +232,7 @@ class AODSelectConfiguration(object):
             logAODSelect_helpers.debug( "Values of current AODSelectAlgConfig: " )
             if logAODSelect_helpers.isEnabledFor(logging.DEBUG): algConfig.doPrint()
             algName = "AODSelect_" + algConfig.name.split("#")[1] + "_SelectionAlg"
-            logAODSelect_helpers.debug( "Now creating an algorithm with name %s" % algName )
+            logAODSelect_helpers.debug( "Now creating an algorithm with name %s", algName )
             algClass = self.algDict[algConfig.inputType]
             alg = algClass( algName,
                             inputCollection                = algConfig.inputKey,
@@ -277,38 +274,38 @@ class AODSelectAlgConfig(object):
 
 
     def setInputTypeAndKey(self, inputTypeAndKey=None, inputKey=None):
-        if inputTypeAndKey == None:
+        if inputTypeAndKey is None:
             logAODSelect_helpers.warning( "Got an empty value in setInputTypeAndKey... exiting!" )
             return
         if inputTypeAndKey.__contains__("#"):
             self.inputTypeAndKey          = inputTypeAndKey
             self.inputType, self.inputKey = inputTypeAndKey.split("#")
-            logAODSelect_helpers.debug( "Setting inputTypeAndKey=%s, inputType=%s, inputKey=%s"
-                                        % (self.inputTypeAndKey, self.inputType, self.inputKey) )
+            logAODSelect_helpers.debug( "Setting inputTypeAndKey=%s, inputType=%s, inputKey=%s",
+                                        self.inputTypeAndKey, self.inputType, self.inputKey )
             return
-        elif inputKey != None:
+        elif inputKey is not None:
             self.inputTypeAndKey = inputTypeAndKey + "#" + inputKey
             self.inputType       = inputTypeAndKey
             self.inputKey        = inputKey
-            logAODSelect_helpers.debug( "Setting inputTypeAndKey=%s, inputType=%s, inputKey=%s"
-                                        % (self.inputTypeAndKey, self.inputType, self.inputKey) )
+            logAODSelect_helpers.debug( "Setting inputTypeAndKey=%s, inputType=%s, inputKey=%s",
+                                        self.inputTypeAndKey, self.inputType, self.inputKey )
             return
-        logAODSelect_helpers.warning( "Could not understand what to do with inputTypeAndKey=%s and inputKey=%s"
-                                      % (inputTypeAndKey, inputKey) )
+        logAODSelect_helpers.warning( "Could not understand what to do with inputTypeAndKey=%s and inputKey=%s",
+                                      inputTypeAndKey, inputKey )
         return
 
 
     def doPrint(self):
-        logAODSelect_helpers.info( "Found an AODSelectAlgConfig with name = %s" % self.name )
-        logAODSelect_helpers.info( "   and inputTypeAndKey       = %s" % self.inputTypeAndKey )
-        logAODSelect_helpers.info( "   and inputType             = %s" % self.inputType )
-        logAODSelect_helpers.info( "   and inputKey              = %s" % self.inputKey )
-        logAODSelect_helpers.info( "   and outputCollection      = %s" % self.outputCollection )
-        logAODSelect_helpers.info( "   and outputLinkCollection  = %s" % self.outputLinkCollection )
-        logAODSelect_helpers.info( "   and selectorToolList      = %s" % self.selectorToolList )
-        logAODSelect_helpers.info( "   and userDataToolList      = %s" % self.userDataToolList )
-        logAODSelect_helpers.info( "   and associationToolList   = %s" % self.associationToolList )
-        logAODSelect_helpers.info( "   and outputAssociationList = %s" % self.outputAssociationList )
+        logAODSelect_helpers.info( "Found an AODSelectAlgConfig with name = %s", self.name )
+        logAODSelect_helpers.info( "   and inputTypeAndKey       = %s", self.inputTypeAndKey )
+        logAODSelect_helpers.info( "   and inputType             = %s", self.inputType )
+        logAODSelect_helpers.info( "   and inputKey              = %s", self.inputKey )
+        logAODSelect_helpers.info( "   and outputCollection      = %s", self.outputCollection )
+        logAODSelect_helpers.info( "   and outputLinkCollection  = %s", self.outputLinkCollection )
+        logAODSelect_helpers.info( "   and selectorToolList      = %s", self.selectorToolList )
+        logAODSelect_helpers.info( "   and userDataToolList      = %s", self.userDataToolList )
+        logAODSelect_helpers.info( "   and associationToolList   = %s", self.associationToolList )
+        logAODSelect_helpers.info( "   and outputAssociationList = %s", self.outputAssociationList )
         return
 
     pass
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/MuJetOverlapTool.cxx b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/MuJetOverlapTool.cxx
index 64c4a14e69c72b03fa8b2b4b9389a9e21672fd62..11f292444ed5061b85e941cfb5ddd5ed1b55a7fc 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/MuJetOverlapTool.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/MuJetOverlapTool.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 // System includes
@@ -172,8 +172,16 @@ namespace ORUtils
         // Don't reject jets with high track multiplicity and
         // high relative PT ratio
         bool highNumTrk = nTrk >= m_numJetTrk;
-        bool highRelPt = (muon->pt()/jet->pt() < m_muJetPtRatio ||
-                          muon->pt()/sumTrkPt < m_muJetTrkPtRatio);
+        bool highRelPt = false;
+
+	if (sumTrkPt < FLT_MIN){
+	  highRelPt = (muon->pt()/jet->pt() < m_muJetPtRatio);
+	}
+	else{
+	  highRelPt = (muon->pt()/jet->pt() < m_muJetPtRatio ||
+		       muon->pt()/sumTrkPt < m_muJetTrkPtRatio);
+	}
+
         if(highNumTrk && (!m_applyRelPt || highRelPt)) continue;
 
         if(m_dRMatchCone1->objectsMatch(*muon, *jet)){
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleBuilderOptions/CMakeLists.txt b/PhysicsAnalysis/AnalysisCommon/ParticleBuilderOptions/CMakeLists.txt
index 79be0526cbefa896e94eff23d2f6ee0b47d618da..04e0ca4d1a59e1e4c4dfb2cfbacbacecffd02df3 100644
--- a/PhysicsAnalysis/AnalysisCommon/ParticleBuilderOptions/CMakeLists.txt
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleBuilderOptions/CMakeLists.txt
@@ -1,11 +1,8 @@
-################################################################################
-# Package: ParticleBuilderOptions
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( ParticleBuilderOptions )
 
 # Install files from the package:
-atlas_install_python_modules( python/__init__.py python/AODFlags.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
 atlas_install_joboptions( share/*.py )
-
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleBuilderOptions/python/AODFlags.py b/PhysicsAnalysis/AnalysisCommon/ParticleBuilderOptions/python/AODFlags.py
index 7f4071058ee03af77e9d0192cbd60fd8bcba2ea1..79747bf2298ab15edd72470c26dfb49e145a8390 100755
--- a/PhysicsAnalysis/AnalysisCommon/ParticleBuilderOptions/python/AODFlags.py
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleBuilderOptions/python/AODFlags.py
@@ -21,7 +21,6 @@ __doc__="AOD Building specific flags . "
 #=======================================================================
 from AthenaCommon.JobProperties import JobProperty, JobPropertyContainer
 from AthenaCommon.JobProperties import jobproperties
-from AthenaCommon.Constants import *
 
 #=======================================================================
 # Define AOD properties by class, keeping compatibily with
@@ -257,7 +256,7 @@ class AODFlagsContainer(JobPropertyContainer):
             o=self.__dict__.get(k)
             if hasattr(o,'StoredValue'):
                 if o.statusOn and o.allowedTypes==['bool']:
-                    if o.get_Value()==True:
+                    if o.get_Value() is True:
                         print (format % (o.__name__, "ON"))
                     else:
                         print (format % (o.__name__, "--"))
diff --git a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/CMakeLists.txt b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/CMakeLists.txt
index eef90fc570c5dc895b1866925ebd16399c80f88b..6fa96ca41a5072e718fd8537d098a26d49b96ca4 100644
--- a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/CMakeLists.txt
+++ b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/CMakeLists.txt
@@ -1,7 +1,4 @@
-# $Id: CMakeLists.txt 795961 2017-02-07 12:53:47Z jcatmore $
-################################################################################
-# Package: ThinningUtils
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( ThinningUtils )
@@ -9,15 +6,15 @@ atlas_subdir( ThinningUtils )
 # Extra dependencies, based on the build environment:
 set( extra_libs )
 if( NOT XAOD_ANALYSIS )
-   set( extra_libs CaloEvent TrigDecisionToolLib )
+   set( extra_libs CaloEvent TrkTrack TrigDecisionToolLib )
 endif()
 
 # Component(s) in the package:
 atlas_add_component(ThinningUtils
    src/*.h src/*.cxx src/components/*.cxx
-   LINK_LIBRARIES AthLinks AthenaBaseComps AthenaKernel StoreGateLib SGtests EventInfo xAODBase
-   xAODCaloEvent xAODEgamma xAODJet xAODMuon xAODParticleEvent xAODTau
-   xAODTracking xAODTruth GaudiKernel InDetReadoutGeometry TRT_ReadoutGeometry ExpressionEvaluationLib TrkToolInterfaces MCTruthClassifierLib DerivationFrameworkInterfaces ${extra_libs})
+   LINK_LIBRARIES AthContainers AthLinks AthenaBaseComps StoreGateLib EventInfo xAODBase
+   xAODCaloEvent xAODEgamma xAODJet xAODMuon xAODParticleEvent xAODPFlow xAODTau
+   xAODTracking xAODTruth GaudiKernel InDetReadoutGeometry TRT_ReadoutGeometry ExpressionEvaluationLib MCTruthClassifierLib DerivationFrameworkInterfaces ${extra_libs})
 
 # Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/python/ThinInDetForwardTrackParticles.py b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/python/ThinInDetForwardTrackParticles.py
index 299fca369b22c0ca46a137a96d84c5be3fd9e913..93d33ee337444768ef9ce29e2fd95a438459d20d 100644
--- a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/python/ThinInDetForwardTrackParticles.py
+++ b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/python/ThinInDetForwardTrackParticles.py
@@ -17,8 +17,7 @@ class ThinInDetForwardTrackParticles(Configured):
                                       and  any(InDetKeys.xAODForwardTrackParticleContainer() in elements
                                              for elements in inputFileSummary['eventdata_items']))
         if not have_InDetForwardParticles and ( not InDetFlags.doForwardTracks() or not InDetFlags.doParticleCreation() ) :
-            mlog.error("Not attempting to thin InDetForwardParticles, because the container %s does not seem to be available"
-                       % (InDetKeys.xAODForwardTrackParticleContainer()))
+            mlog.error("Not attempting to thin InDetForwardParticles, because the container %s does not seem to be available", InDetKeys.xAODForwardTrackParticleContainer())
             return True
 
         mlog.info('entering')
diff --git a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/python/ThinTrkTrack.py b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/python/ThinTrkTrack.py
index 670f3077cfbe68431fa0c9880dcf4b1806c7f676..1dc9bb3a58df59f6e1c1733f122c5f08b7077f99 100644
--- a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/python/ThinTrkTrack.py
+++ b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/python/ThinTrkTrack.py
@@ -1,10 +1,7 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-from __future__ import print_function
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 from RecExConfig.Configured import Configured
 from AthenaCommon.Logging import logging
-from AthenaCommon.AthenaCommonFlags  import athenaCommonFlags
 
 class ThinTrkTrack(Configured):    
     def configure(self):
@@ -28,8 +25,6 @@ class ThinTrkTrack(Configured):
                 GSFTrackKey="GSFTracks",
                 StreamName='StreamAOD')
             
-            from AthenaCommon.Constants import VERBOSE, DEBUG, INFO, ERROR           
-            #theTrkTrackThinner.OutputLevel=DEBUG            
             print (theTrkTrackThinner)
 
         except Exception:
diff --git a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/python/TrkTrackPostExecStream.py b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/python/TrkTrackPostExecStream.py
index 2e6f2d911e1c40fbcea889cd7cc5b08cd429b774..245ec4d1ad3068c3797ea40b5486f46a0bcf21c3 100644
--- a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/python/TrkTrackPostExecStream.py
+++ b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/python/TrkTrackPostExecStream.py
@@ -1,8 +1,7 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 from RecExConfig.Configured import Configured
 from AthenaCommon.Logging import logging
-from AthenaCommon.AthenaCommonFlags  import athenaCommonFlags
 
 class TrkTrackPostExecStream(Configured):
     
diff --git a/Reconstruction/HeavyIonRec/HIJetRec/src/HIClusterSubtraction.h b/Reconstruction/HeavyIonRec/HIJetRec/src/HIClusterSubtraction.h
index d73a7dff18601fc93737fef358abd42864992cbe..e962a63ccd082ee892494421653205c5dec57292 100644
--- a/Reconstruction/HeavyIonRec/HIJetRec/src/HIClusterSubtraction.h
+++ b/Reconstruction/HeavyIonRec/HIJetRec/src/HIClusterSubtraction.h
@@ -33,7 +33,6 @@
 #include "StoreGate/ReadHandleKey.h"
 #include "StoreGate/WriteHandleKey.h"
 
-#include "xAODCaloEvent/CaloClusterContainer.h"
 #include "xAODHIEvent/HIEventShapeContainer.h"
 
 class HIClusterSubtraction : virtual public asg::AsgTool,
diff --git a/Reconstruction/Jet/JetAnalysisTools/JetAnalysisEDM/Root/LinkDef.h b/Reconstruction/Jet/JetAnalysisTools/JetAnalysisEDM/Root/LinkDef.h
index 6e0b7cf3e818d0b5fc592533d8b2d475a88d5706..3777858997f537b25b9f04e6b4b1fc966079e7ca 100644
--- a/Reconstruction/Jet/JetAnalysisTools/JetAnalysisEDM/Root/LinkDef.h
+++ b/Reconstruction/Jet/JetAnalysisTools/JetAnalysisEDM/Root/LinkDef.h
@@ -16,9 +16,6 @@
 #include "../JetAnalysisEDM/ParticleContainer.h"
 #include "../JetAnalysisEDM/EventObject.h"
 #include "../JetAnalysisEDM/EventManager.h"
-//#include "Math/Vector4D.h"
-
-#include "../JetAnalysisEDM/Utils.h"
 
 #pragma link off all globals;
 #pragma link off all classes;
diff --git a/Reconstruction/Jet/JetEvent/src/Jet.cxx b/Reconstruction/Jet/JetEvent/src/Jet.cxx
index 28b3bbeb2684db1bc9d971bcebcf64fcf4c3aaff..391f54757fb5a400dd64143472e26c6b7c976740 100755
--- a/Reconstruction/Jet/JetEvent/src/Jet.cxx
+++ b/Reconstruction/Jet/JetEvent/src/Jet.cxx
@@ -22,8 +22,6 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include <cmath>
-
 // externals
 #include "CLHEP/Units/SystemOfUnits.h"
 #include "CLHEP/Vector/LorentzVector.h"
diff --git a/Reconstruction/Jet/JetEvent/src/JetECS.cxx b/Reconstruction/Jet/JetEvent/src/JetECS.cxx
index 1b94eb575f319cfd11b8f2cb8e7a9054f5d506f1..50e59f12d234766cbfc5193c03c2591f53b52874 100755
--- a/Reconstruction/Jet/JetEvent/src/JetECS.cxx
+++ b/Reconstruction/Jet/JetEvent/src/JetECS.cxx
@@ -14,7 +14,6 @@ June 2004: Modified from CombinedJetSums to use Jet and new Navigation.
 
 #include "JetEvent/JetECS.h"
 #include "JetEvent/Jet.h"
-#include "JetEvent/Jet.h"
 
 
 JetECS::JetECS(double e, double eta, double phi, double m)
diff --git a/Reconstruction/Jet/JetEvent/src/JetINav4MomAssociation.cxx b/Reconstruction/Jet/JetEvent/src/JetINav4MomAssociation.cxx
index d0c0e72852ee8be53afe5734d7af4c623e95705a..639b111165cb62c614abafecaa748129f5b13de0 100644
--- a/Reconstruction/Jet/JetEvent/src/JetINav4MomAssociation.cxx
+++ b/Reconstruction/Jet/JetEvent/src/JetINav4MomAssociation.cxx
@@ -4,8 +4,6 @@
 
 #include "JetEvent/JetINav4MomAssociation.h"
 
-#include "JetEvent/JetINav4MomAssociation.h"
-
 JetINav4MomAssociation::JetINav4MomAssociation()
 {  } 
   
diff --git a/Reconstruction/Jet/JetEvent/src/JetSums.cxx b/Reconstruction/Jet/JetEvent/src/JetSums.cxx
index 051c38f890c4e91101d9c4a9627cf1cc867c200e..1c77af3731707730c2c6df49084a39234bdb81d5 100755
--- a/Reconstruction/Jet/JetEvent/src/JetSums.cxx
+++ b/Reconstruction/Jet/JetEvent/src/JetSums.cxx
@@ -14,7 +14,6 @@ June 2004: Modified from CombinedJetSums to use Jet and new Navigation.
 
 #include "JetEvent/JetSums.h"
 #include "JetEvent/Jet.h"
-#include "JetEvent/Jet.h"
 
 
 JetSums::JetSums(double e, double et, double eta, double phi, double m)
diff --git a/Reconstruction/Jet/JetEventTPCnv/src/JetCnv_p5.cxx b/Reconstruction/Jet/JetEventTPCnv/src/JetCnv_p5.cxx
index 8e3a47580998c9bd0c17f0239164ccba26a24e0e..06f3ad4324b85cbfb23d13df3161cef75e7cda1f 100644
--- a/Reconstruction/Jet/JetEventTPCnv/src/JetCnv_p5.cxx
+++ b/Reconstruction/Jet/JetEventTPCnv/src/JetCnv_p5.cxx
@@ -13,11 +13,6 @@
 // DataModelAthenaPool includes
 #include "DataModelAthenaPool/NavigableCnv_p1.h"
 
-// EventCommonTPCnv includes
-// #include "EventCommonTPCnv/P4ImplPxPyPzECnv_p1.h"
-
-// #include "JetEventTPCnv/JetSignalStateCnv.h"
-
 #include "ParticleEventTPCnv/ParticleBaseCnv_p1.h"
 
 // JetEvent includes
diff --git a/Reconstruction/Jet/JetMomentTools/JetMomentTools/JetForwardJvtTool.h b/Reconstruction/Jet/JetMomentTools/JetMomentTools/JetForwardJvtTool.h
index cf9407b73835d7e8daccd47590afaf71b20317cf..363cd7c4b724759c77a92b43581e37b2733dad97 100644
--- a/Reconstruction/Jet/JetMomentTools/JetMomentTools/JetForwardJvtTool.h
+++ b/Reconstruction/Jet/JetMomentTools/JetMomentTools/JetForwardJvtTool.h
@@ -27,7 +27,6 @@
 #include "xAODTracking/VertexContainer.h"
 #include "xAODMissingET/MissingETContainer.h"
 #include "xAODCaloEvent/CaloCluster.h"
-#include "xAODTracking/VertexContainer.h"
 #include "JetInterface/IJetDecorator.h"
 #include "AsgTools/IAsgTool.h"
 
diff --git a/Reconstruction/Jet/JetMomentTools/JetMomentTools/JetForwardJvtToolBDT.h b/Reconstruction/Jet/JetMomentTools/JetMomentTools/JetForwardJvtToolBDT.h
index 87ba3dd0fc0539556d2bcf305c4a86d9f2b7bad0..300f7db52b4f5ec0d197cd94b7ca622a9be858da 100644
--- a/Reconstruction/Jet/JetMomentTools/JetMomentTools/JetForwardJvtToolBDT.h
+++ b/Reconstruction/Jet/JetMomentTools/JetMomentTools/JetForwardJvtToolBDT.h
@@ -38,7 +38,6 @@
 #include "AsgDataHandles/ReadDecorHandle.h"
 #include "AsgDataHandles/WriteDecorHandleKey.h"
 #include "AsgDataHandles/WriteDecorHandle.h"
-#include "xAODTracking/VertexContainer.h"
 
 
 namespace TMVA{ class Reader; }
diff --git a/Reconstruction/Jet/JetRec/Root/PseudoJetContainer.cxx b/Reconstruction/Jet/JetRec/Root/PseudoJetContainer.cxx
index fe25e4f0d77f0f664ee11dec87acc6b266bdc7bc..449796aacf5631518017cf5a495ab26a179645bb 100644
--- a/Reconstruction/Jet/JetRec/Root/PseudoJetContainer.cxx
+++ b/Reconstruction/Jet/JetRec/Root/PseudoJetContainer.cxx
@@ -14,7 +14,6 @@
 #include <ios>
 #include <iostream>
 #include <exception>
-#include <map>
 
 using fastjet::PseudoJet;
 
diff --git a/Reconstruction/Jet/JetRecTools/Root/LinkDef.h b/Reconstruction/Jet/JetRecTools/Root/LinkDef.h
index 3370efd98964d460d182361e0f9668066537cbfb..3b802d125d2cd747794c065fdde3b1c20191018f 100644
--- a/Reconstruction/Jet/JetRecTools/Root/LinkDef.h
+++ b/Reconstruction/Jet/JetRecTools/Root/LinkDef.h
@@ -11,8 +11,6 @@
 #include <JetRecTools/JetConstituentModifierBase.h>
 #include <JetRecTools/CaloClusterConstituentsOrigin.h>
 #include <JetRecTools/ConstituentSubtractorTool.h>
-#include <JetRecTools/JetConstituentModifierBase.h>
-#include <JetRecTools/JetConstituentModSequence.h>
 #include <JetRecTools/SoftKillerWeightTool.h>
 #include <JetRecTools/VoronoiWeightTool.h>
 #include <JetRecTools/PFlowPseudoJetGetter.h>
diff --git a/Reconstruction/Jet/JetSubStructureUtils/Root/BosonTag.cxx b/Reconstruction/Jet/JetSubStructureUtils/Root/BosonTag.cxx
index 33a3d85d2f34f25a4cc330b5fdfedce590342bcc..dc4fce1fb0fc91a492162d339a9abf14ea44c208 100644
--- a/Reconstruction/Jet/JetSubStructureUtils/Root/BosonTag.cxx
+++ b/Reconstruction/Jet/JetSubStructureUtils/Root/BosonTag.cxx
@@ -3,7 +3,6 @@
 */
 
 #include "JetSubStructureUtils/BosonTag.h"
-#include <iostream>
 
 #ifndef ROOTCORE
 #include "PathResolver/PathResolver.h"
diff --git a/Reconstruction/Jet/JetUncertainties/testingMacros/code/CompareCorrelations.C b/Reconstruction/Jet/JetUncertainties/testingMacros/code/CompareCorrelations.C
index d7a57568dc0d7107cbf60316f42605ec85f8cd83..fd0d4b6b4c4c0913230b80b670f07234ae12b7a3 100644
--- a/Reconstruction/Jet/JetUncertainties/testingMacros/code/CompareCorrelations.C
+++ b/Reconstruction/Jet/JetUncertainties/testingMacros/code/CompareCorrelations.C
@@ -15,7 +15,6 @@
 #include "TLatex.h"
 #include "TROOT.h"
 #include "TH2D.h"
-#include "TSystem.h"
 #include "TStyle.h"
 #include "TError.h"
 #include <iostream>
diff --git a/Reconstruction/Jet/JetUncertainties/testingMacros/code/PropagateJES.C b/Reconstruction/Jet/JetUncertainties/testingMacros/code/PropagateJES.C
index e37f01aa858a9823eab6209ab6e2550cfb8e54a5..b3be57fb342803fd6d3486685d4e639dbf1921e7 100644
--- a/Reconstruction/Jet/JetUncertainties/testingMacros/code/PropagateJES.C
+++ b/Reconstruction/Jet/JetUncertainties/testingMacros/code/PropagateJES.C
@@ -16,7 +16,6 @@
 #include "TLatex.h"
 #include "TROOT.h"
 #include "TH2D.h"
-#include "TSystem.h"
 #include "TStyle.h"
 #include "TError.h"
 #include "TRandom.h"
diff --git a/Reconstruction/Jet/JetUtils/Root/JetCaloQualityUtils.cxx b/Reconstruction/Jet/JetUtils/Root/JetCaloQualityUtils.cxx
index e8c0f23ac13f154b55c135d31d461a0c74dfb0ea..80ad32026a9ff0177cf536698785d03beabf2d75 100644
--- a/Reconstruction/Jet/JetUtils/Root/JetCaloQualityUtils.cxx
+++ b/Reconstruction/Jet/JetUtils/Root/JetCaloQualityUtils.cxx
@@ -12,9 +12,6 @@
 #include "CaloGeoHelpers/CaloSampling.h"
 
 
-#include "xAODCaloEvent/CaloCluster.h"
-
-
 using xAOD::Jet;
 using xAOD::CaloCluster;
 
diff --git a/Reconstruction/MissingETGoodness/MissingETGoodness/JetGoodiesFiller.h b/Reconstruction/MissingETGoodness/MissingETGoodness/JetGoodiesFiller.h
index 7051d6a72bc17f0df597127588a5fc823a021433..6f08cc7c2364c9df11492ff9baf645a2a399a25d 100644
--- a/Reconstruction/MissingETGoodness/MissingETGoodness/JetGoodiesFiller.h
+++ b/Reconstruction/MissingETGoodness/MissingETGoodness/JetGoodiesFiller.h
@@ -12,7 +12,6 @@
 
 #include "MissingETGoodness/JetVarTool.h"
 #include "AthenaBaseComps/AthAlgorithm.h"
-#include "GaudiKernel/ToolHandle.h"
 #include "MissingETGoodness/Goodies.h"
 
 #include "TString.h"
diff --git a/Reconstruction/Particle/Particle/TrackParticle.h b/Reconstruction/Particle/Particle/TrackParticle.h
index b386a116e5ac57e3463065ae12a3073abe20b0e2..a4a0ee47e1ebef70a9a5944db66706b2c5e038e5 100755
--- a/Reconstruction/Particle/Particle/TrackParticle.h
+++ b/Reconstruction/Particle/Particle/TrackParticle.h
@@ -29,7 +29,6 @@
 #include "TrkTrack/Track.h"
 #include "TrkParameters/TrackParameters.h"
 #include "TrkTrackSummary/TrackSummary.h"
-#include "TrkTrack/TrackCollection.h"
 #include "TrkEventPrimitives/FitQuality.h"
 
 #include "TrkParticleBase/TrackParticleBase.h"
diff --git a/Reconstruction/RecExample/RecExTB/root/include/monitor.h b/Reconstruction/RecExample/RecExTB/root/include/monitor.h
index 7194a7083a69ba46f682990bdfd509a24a7ce146..f7323f6781a6c55ee505fdbf895d47d7bcf0eacf 100755
--- a/Reconstruction/RecExample/RecExTB/root/include/monitor.h
+++ b/Reconstruction/RecExample/RecExTB/root/include/monitor.h
@@ -18,7 +18,6 @@
 #include "TGraph.h"
 #include "TH1.h"
 #include "TH2.h"
-#include "TGraph.h"
 #include "TProfile.h"
 #include "TCanvas.h"
 #include "TStyle.h"
diff --git a/Reconstruction/RecoAlgs/IsolationAlgs/src/IsolationBuilder.h b/Reconstruction/RecoAlgs/IsolationAlgs/src/IsolationBuilder.h
index f5906ea2540d6e63a7ba48d9965c2ba4b3e576f1..a9cfafa0df2157707a2030a250f07d7c026f3108 100644
--- a/Reconstruction/RecoAlgs/IsolationAlgs/src/IsolationBuilder.h
+++ b/Reconstruction/RecoAlgs/IsolationAlgs/src/IsolationBuilder.h
@@ -35,7 +35,6 @@
 #include "IsolationCorrections/IIsolationCorrectionTool.h"
 #include "xAODPrimitives/IsolationConeSize.h"
 #include "xAODPrimitives/IsolationHelpers.h"
-#include "xAODPrimitives/IsolationFlavour.h"
 #include "xAODBase/IParticleContainer.h"
 
 #include "RecoToolInterfaces/ICaloCellIsolationTool.h"
diff --git a/Reconstruction/RecoTools/TrackToCalo/src/CaloCellCollector.cxx b/Reconstruction/RecoTools/TrackToCalo/src/CaloCellCollector.cxx
index 357a422426f02d9e2b72674548c2b910a5d63280..8f77e037543c1e25522bff758abad9411832a15d 100644
--- a/Reconstruction/RecoTools/TrackToCalo/src/CaloCellCollector.cxx
+++ b/Reconstruction/RecoTools/TrackToCalo/src/CaloCellCollector.cxx
@@ -11,7 +11,6 @@
 #include "CaloEvent/CaloCellContainer.h"
 
 #include "CaloUtils/CaloCellList.h"
-#include "CaloEvent/CaloCellContainer.h"
 #include "CaloIdentifier/CaloCell_ID.h"
 #include "CaloDetDescr/CaloDetDescrManager.h"
 #include "CaloIdentifier/CaloIdManager.h"
diff --git a/Reconstruction/RecoTools/TrackToCalo/src/ParticleCaloCellAssociationTool.cxx b/Reconstruction/RecoTools/TrackToCalo/src/ParticleCaloCellAssociationTool.cxx
index cd37cc80bf6d45846112ec49a538741fe64f57eb..3271afdb171b77c051501fe9a6b0ab97dde27b0c 100644
--- a/Reconstruction/RecoTools/TrackToCalo/src/ParticleCaloCellAssociationTool.cxx
+++ b/Reconstruction/RecoTools/TrackToCalo/src/ParticleCaloCellAssociationTool.cxx
@@ -15,8 +15,6 @@
 #include "TrkCaloExtension/CaloExtension.h"
 #include "TrkCaloExtension/CaloExtensionHelpers.h"
 
-#include "CaloUtils/CaloCellList.h"
-
 #include "xAODTracking/TrackingPrimitives.h"
 #include <cmath>
 #include <memory>
diff --git a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecValidation/src/TCCPlots.h b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecValidation/src/TCCPlots.h
index e2827ab150f173cd47cd2bfee63753f43d4419e5..f5ca7981093fbb9c05f0871ce474c459b5b6ebe6 100644
--- a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecValidation/src/TCCPlots.h
+++ b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecValidation/src/TCCPlots.h
@@ -13,7 +13,6 @@
 #include "TCCPlotsBase.h"
 #include "xAODJet/JetContainer.h"
 #include "xAODTracking/TrackParticleContainer.h"
-#include "xAODTracking/TrackParticleContainer.h"
 #include "xAODCaloEvent/CaloClusterContainer.h"
 #include "xAODPFlow/TrackCaloClusterContainer.h"
 #include "xAODTruth/TruthParticleContainer.h"
@@ -694,4 +693,4 @@ inline const xAOD::TrackParticle* TCCPlots::getTrackParticlePtr(const xAOD::Trac
 
 
 
-#endif // TRACKCALOCLUSTERREC_TRACKCALOCLUSTERRECVALIDATION_TCCPLOTS_H
\ No newline at end of file
+#endif // TRACKCALOCLUSTERREC_TRACKCALOCLUSTERRECVALIDATION_TCCPLOTS_H
diff --git a/Reconstruction/TrackParticleTPCnv/TrackParticleTPCnv/TrackParticleContainer_tlp1.h b/Reconstruction/TrackParticleTPCnv/TrackParticleTPCnv/TrackParticleContainer_tlp1.h
index 2821e98b6a0abd71989da2c525b696469d26ee07..2972db15e063ba1df4f382244ad2a542dc94fd8b 100755
--- a/Reconstruction/TrackParticleTPCnv/TrackParticleTPCnv/TrackParticleContainer_tlp1.h
+++ b/Reconstruction/TrackParticleTPCnv/TrackParticleTPCnv/TrackParticleContainer_tlp1.h
@@ -77,7 +77,6 @@
 
 // next line can be removed as soon as TPCnvTokenList_p1.h is fixed (i.e. includes string)
 #include <string>
-#include "AthenaPoolUtilities/TPCnvTokenList_p1.h"
 
 #include <ios>
 
diff --git a/Reconstruction/TrackParticleTPCnv/TrackParticleTPCnv/TrackParticleContainer_tlp2.h b/Reconstruction/TrackParticleTPCnv/TrackParticleTPCnv/TrackParticleContainer_tlp2.h
index 145234daa5388be83f635e187436aeb3135f2a1c..4e524ed9aa5b83c701d83206832631d7f6f13ad0 100644
--- a/Reconstruction/TrackParticleTPCnv/TrackParticleTPCnv/TrackParticleContainer_tlp2.h
+++ b/Reconstruction/TrackParticleTPCnv/TrackParticleTPCnv/TrackParticleContainer_tlp2.h
@@ -69,7 +69,6 @@
 
 // next line can be removed as soon as TPCnvTokenList_p1.h is fixed (i.e. includes string)
 #include <string>
-#include "AthenaPoolUtilities/TPCnvTokenList_p1.h"
 
 #include <ios>
 
diff --git a/Reconstruction/TrackParticleTPCnv/TrackParticleTPCnv/TrackParticleContainer_tlp3.h b/Reconstruction/TrackParticleTPCnv/TrackParticleTPCnv/TrackParticleContainer_tlp3.h
index f6adc16d9fade075e982ae3850b6ae4d94749984..1918b4d644b9a3f93f7518fd470a2dc6b2d1f572 100644
--- a/Reconstruction/TrackParticleTPCnv/TrackParticleTPCnv/TrackParticleContainer_tlp3.h
+++ b/Reconstruction/TrackParticleTPCnv/TrackParticleTPCnv/TrackParticleContainer_tlp3.h
@@ -30,10 +30,6 @@
 
 #include <ios>
 
-#include "AthenaPoolUtilities/TPCnvTokenList_p1.h"
-
-#include <ios>
-
 namespace Rec
 {
     class TrackParticleContainer_tlp3
diff --git a/Reconstruction/eflowRec/src/eflowSubtractor.cxx b/Reconstruction/eflowRec/src/eflowSubtractor.cxx
index 32e8cdb511fc63c6085119ec08f0a3198d7fc192..4fe94c0c0175b0d7681e25f9dfa420ac936db207 100644
--- a/Reconstruction/eflowRec/src/eflowSubtractor.cxx
+++ b/Reconstruction/eflowRec/src/eflowSubtractor.cxx
@@ -9,7 +9,6 @@
  *      Author: zhangrui
  */
 
-#include "xAODCaloEvent/CaloCluster.h"
 #include "xAODCaloEvent/CaloCluster.h"
 #include "xAODCaloEvent/CaloClusterKineHelper.h"
 #include "eflowRec/eflowRecTrack.h"
@@ -21,7 +20,6 @@
 #include "eflowRec/eflowLayerIntegrator.h"
 #include "eflowRec/eflowEEtaBinnedParameters.h"
 #include "eflowRec/eflowSubtractor.h"
-#include "xAODCaloEvent/CaloClusterKineHelper.h"
 
 
 namespace eflowSubtract {
diff --git a/Reconstruction/egamma/EgammaPhysValMonitoring/src/ElectronPlots.cxx b/Reconstruction/egamma/EgammaPhysValMonitoring/src/ElectronPlots.cxx
index 42b93e86d4a470fc1ac3e488193c1c65d7a4f7e2..aaaf3241a06a6ed0991f13ad587118a42f8df702 100755
--- a/Reconstruction/egamma/EgammaPhysValMonitoring/src/ElectronPlots.cxx
+++ b/Reconstruction/egamma/EgammaPhysValMonitoring/src/ElectronPlots.cxx
@@ -7,18 +7,13 @@
 #include "xAODTruth/TruthParticle.h"
 #include "xAODTruth/TruthParticleContainer.h"
 #include "xAODTruth/TruthParticleAuxContainer.h"
-
-#include "xAODTruth/TruthParticle.h"
-#include "xAODTruth/TruthParticleContainer.h"
-#include "xAODTruth/TruthParticleAuxContainer.h"
-
 #include <iostream>
 using namespace std;
 using namespace MCTruthPartClassifier;
 
 namespace Egamma{
 
-ElectronPlots::ElectronPlots(PlotBase* pParent, const std::string& sDir, 
+ElectronPlots::ElectronPlots(PlotBase* pParent, const std::string& sDir,
 			     const std::string& sParticleType):PlotBase(pParent, sDir),
 							m_oKinAllRecoPlots(this, "All/KinPlots/", "All Reco "+ sParticleType +" Electron"),
 							m_oShowerShapesAllRecoPlots(this, "All/ShowerShapesPlots/","All Reco "+ sParticleType +" Electron"  ),
@@ -37,7 +32,7 @@ ElectronPlots::ElectronPlots(PlotBase* pParent, const std::string& sDir,
 						        nParticles(nullptr),
 							nTypeParticles(nullptr),
 							m_sParticleType(sParticleType)
-{}	
+{}
 
 void ElectronPlots::initializePlots(){
   nParticles = Book1D("n", "Number of"+ m_sParticleType + "s;#" + m_sParticleType + " electrons;Events", 15, 0, 15.);
@@ -50,27 +45,27 @@ void ElectronPlots::initializePlots(){
   m_oShowerShapesAllRecoPlots.fill(electron);
   m_oIsolationAllRecoPlots.fill(electron);
   m_oTrackAllRecoPlots.fill(electron);
- 
-  if(!isPrompt) return; 
-   
+
+  if(!isPrompt) return;
+
   m_oKinIsoRecoPlots.fill(electron);
   m_oShowerShapesIsoRecoPlots.fill(electron);
   m_oIsolationIsoRecoPlots.fill(electron);
   m_oTrackIsoRecoPlots.fill(electron);
- 
-  bool val_loose=false;    
+
+  bool val_loose=false;
   electron.passSelection(val_loose, "Loose");
   if(val_loose) {
     m_oKinIsoLoosePPPlots.fill(electron);
   }
 
-  bool val_med=false;  
+  bool val_med=false;
   electron.passSelection(val_med, "Medium");
   if(val_med) {
     m_oKinIsoMediumPPPlots.fill(electron);
   }
 
-  bool val_tight=false;    
+  bool val_tight=false;
   electron.passSelection(val_tight, "Tight");
   if(val_tight) {
     m_oKinIsoTightPPPlots.fill(electron);
diff --git a/Reconstruction/egamma/egammaRec/python/LRTEgammaConfig.py b/Reconstruction/egamma/egammaRec/python/LRTEgammaConfig.py
index baf2f75fb8e2977efa59300e852ccb638d863130..1c42694c654cfe95f8fe9da3d8f20b9bcd16b3a8 100644
--- a/Reconstruction/egamma/egammaRec/python/LRTEgammaConfig.py
+++ b/Reconstruction/egamma/egammaRec/python/LRTEgammaConfig.py
@@ -1,19 +1,23 @@
-from egammaRec.Factories import AlgFactory
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
 from egammaRec import egammaKeys
 from egammaRec.egammaTruthAssociationAlg import egammaTruthAssociationAlg
 from egammaAlgs.egammaSelectedTrackCopy import egammaSelectedTrackCopy
 from egammaAlgs.EMBremCollectionBuilder import EMBremCollectionBuilder
 from egammaAlgs.EMGSFCaloExtensionBuilder import EMGSFCaloExtensionBuilder
 from egammaAlgs.egammaRecBuilder import egammaRecBuilder
-from egammaAlgs.egammaSuperClusterBuilder import electronSuperClusterBuilder, photonSuperClusterBuilder
+from egammaAlgs.egammaSuperClusterBuilder import (
+    electronSuperClusterBuilder, photonSuperClusterBuilder)
 from egammaAlgs.topoEgammaBuilder import topoEgammaBuilder
-from egammaAlgs.egammaLargeClusterMakerAlg import egammaLargeClusterMakerAlg
 from egammaTools.EMTrackMatchBuilder import EMTrackMatchBuilder
-from egammaTrackTools.egammaTrackToolsFactories import *
+from egammaTrackTools.egammaTrackToolsFactories import (
+    EMExtrapolationToolsCommonCache, EMExtrapolationToolsCache)
 from InDetRecExample.InDetKeys import InDetKeys
-from egammaTools.egammaToolsFactories import EMClusterTool, EMFourMomBuilder, EMShowerBuilder, egammaOQFlagsBuilder, ElectronPIDBuilder
+from egammaTools.egammaToolsFactories import (
+    EMClusterTool, EMFourMomBuilder,
+    EMShowerBuilder, egammaOQFlagsBuilder, ElectronPIDBuilder)
 
-LRTEMExtrapolationToolsCommonCache=EMExtrapolationToolsCommonCache.copy(
+LRTEMExtrapolationToolsCommonCache = EMExtrapolationToolsCommonCache.copy(
     name="LRTEMExtrapolationToolsCommonCache",
     LastCache='ParticleCaloExtension_LRT'
 )
@@ -26,7 +30,7 @@ LRTegammaSelectedTrackCopy = egammaSelectedTrackCopy.copy(
 )
 
 LRTEMBremCollectionBuilder = EMBremCollectionBuilder.copy(
-    name = "LRTEMBremCollectionBuilder",
+    name="LRTEMBremCollectionBuilder",
     TrackParticleContainerName=InDetKeys.xAODLargeD0TrackParticleContainer(),
     SelectedTrackParticleContainerName="LRTegammaSelectedTrackParticles",
     OutputTrkPartContainerName="LRT"+egammaKeys.outputTrackParticleKey(),
@@ -40,11 +44,11 @@ LRTEMGSFCaloExtensionBuilder = EMGSFCaloExtensionBuilder.copy(
     GFFTrkPartContainerName="LRT"+egammaKeys.outputTrackParticleKey())
 
 LRTEMExtrapolationToolsCache = EMExtrapolationToolsCache.copy(
-     name="LRTEMExtrapolationToolsCache",
-     PerigeeCache='LRTGSFPerigeeCaloExtension',
-     LastCache='LRTGSFLastCaloExtension',
-     useCaching=True,
-     useLastCaching=True
+    name="LRTEMExtrapolationToolsCache",
+    PerigeeCache='LRTGSFPerigeeCaloExtension',
+    LastCache='LRTGSFLastCaloExtension',
+    useCaching=True,
+    useLastCaching=True
 )
 
 LRTEMTrackMatchBuilder = EMTrackMatchBuilder.copy(
@@ -62,45 +66,41 @@ LRTegammaRecBuilder = egammaRecBuilder.copy(
 )
 
 LRTelectronSuperClusterBuilder = electronSuperClusterBuilder.copy(
-     name='LRTelectronSuperClusterBuilder',
-     InputEgammaRecContainerName="LRT"+egammaKeys.EgammaRecKey(),
-     SuperElectronRecCollectionName="LRT"+egammaKeys.ElectronSuperRecKey(),
-     SuperClusterCollectionName='LRTElectronSuperClusters',
-     TrackMatchBuilderTool=LRTEMTrackMatchBuilder
+    name='LRTelectronSuperClusterBuilder',
+    InputEgammaRecContainerName="LRT"+egammaKeys.EgammaRecKey(),
+    SuperElectronRecCollectionName="LRT"+egammaKeys.ElectronSuperRecKey(),
+    SuperClusterCollectionName='LRTElectronSuperClusters',
+    TrackMatchBuilderTool=LRTEMTrackMatchBuilder
 )
-    
+
 LRTphotonSuperClusterBuilder = photonSuperClusterBuilder.copy(
-     name='LRTphotonSuperClusterBuilder',
-     InputEgammaRecContainerName="LRT"+egammaKeys.EgammaRecKey(),
-     SuperPhotonRecCollectionName="LRT"+egammaKeys.PhotonSuperRecKey(),
-     SuperClusterCollectionName='LRTPhotonSuperClusters',
+    name='LRTphotonSuperClusterBuilder',
+    InputEgammaRecContainerName="LRT"+egammaKeys.EgammaRecKey(),
+    SuperPhotonRecCollectionName="LRT"+egammaKeys.PhotonSuperRecKey(),
+    SuperClusterCollectionName='LRTPhotonSuperClusters',
 )
 
 LRTEMClusterTool = EMClusterTool.copy(
     name='LRTEMClusterTool',
     OutputClusterContainerName="LRT"+egammaKeys.outputClusterKey(),
-    OutputTopoSeededClusterContainerName='LRT'+egammaKeys.outputTopoSeededClusterKey(),
+    OutputTopoSeededClusterContainerName='LRT' +
+    egammaKeys.outputTopoSeededClusterKey(),
 )
 
 LRTtopoEgammaBuilder = topoEgammaBuilder.copy(
-     name='LRTtopoEgammaBuilder',
-     SuperElectronRecCollectionName="LRT"+egammaKeys.ElectronSuperRecKey(),
-     ElectronOutputName="LRT"+egammaKeys.outputElectronKey(),
-     SuperPhotonRecCollectionName="LRT"+egammaKeys.PhotonSuperRecKey(),
-     PhotonOutputName="LRT"+egammaKeys.outputPhotonKey(),
-     EMClusterTool=LRTEMClusterTool,
-     EMShowerTool=EMShowerBuilder,
-     ObjectQualityTool=egammaOQFlagsBuilder,
-     egammaTools= [EMFourMomBuilder()],
-     ElectronTools= [ElectronPIDBuilder()],
-     doPhotons = False
+    name='LRTtopoEgammaBuilder',
+    SuperElectronRecCollectionName="LRT"+egammaKeys.ElectronSuperRecKey(),
+    ElectronOutputName="LRT"+egammaKeys.outputElectronKey(),
+    SuperPhotonRecCollectionName="LRT"+egammaKeys.PhotonSuperRecKey(),
+    PhotonOutputName="LRT"+egammaKeys.outputPhotonKey(),
+    EMClusterTool=LRTEMClusterTool,
+    EMShowerTool=EMShowerBuilder,
+    ObjectQualityTool=egammaOQFlagsBuilder,
+    egammaTools=[EMFourMomBuilder()],
+    ElectronTools=[ElectronPIDBuilder()],
+    doPhotons=False
 )
 
-#LRTegammaLargeClusterMakerAlg=egammaLargeClusterMakerAlg.copy(
-#     name="LRTegammaLargeClusterMaker",
-#     ClustersOutputName="LRT"+egammaKeys.EgammaLargeClustersKey(),
-#)
-
 LRTegammaTruthAssociationAlg = egammaTruthAssociationAlg.copy(
     name='LRTegammaTruthAssociationAlg',
     ElectronContainerName="LRT"+egammaKeys.outputElectronKey(),
@@ -109,4 +109,3 @@ LRTegammaTruthAssociationAlg = egammaTruthAssociationAlg.copy(
     MatchPhotons=False,
     MatchForwardElectrons=False,
 )
-
diff --git a/Reconstruction/egamma/egammaRec/python/LRTtopoEgammaGetter.py b/Reconstruction/egamma/egammaRec/python/LRTtopoEgammaGetter.py
index e516d1cc41c616d55eccdeb9dd1763f3459fec2f..1f07c77ff7c3f788bb215a838ff4220cf2f0d686 100644
--- a/Reconstruction/egamma/egammaRec/python/LRTtopoEgammaGetter.py
+++ b/Reconstruction/egamma/egammaRec/python/LRTtopoEgammaGetter.py
@@ -1,15 +1,11 @@
 # Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 from __future__ import print_function
-from egammaTools.egammaToolsFactories import \
-    EMClusterTool, EMFourMomBuilder, EMShowerBuilder, egammaOQFlagsBuilder, \
-    ElectronPIDBuilder, PhotonPIDBuilder
 
 # specifies standard (supercluster) egamma.
 from AthenaCommon.Logging import logging
 from AthenaCommon.DetFlags import DetFlags
 from RecExConfig.Configured import Configured
-from egammaRec.Factories import FcnWrapper
 from egammaRec import egammaRecFlags as egRecFlags
 egammaRecFlags = egRecFlags.jobproperties.egammaRecFlags
 
@@ -20,22 +16,6 @@ def doConversions():
 # The tools used to add properties
 
 
-def egammaDecorationTools():
-    "Return a list with the tools that decorate both electrons and photons"
-    return [EMFourMomBuilder()]
-
-
-def electronDecorationTools():
-    "Return a list with the tools that decorate only electrons"
-    return [ElectronPIDBuilder()]
-
-
-def photonDecorationTools():
-    "Return a list with the tools that decorate only photons"
-    return [PhotonPIDBuilder()]
-#
-
-
 class LRTtopoEgammaGetter (Configured):
 
     def configure(self):
@@ -55,8 +35,8 @@ class LRTtopoEgammaGetter (Configured):
             return False
 
         # the supercluster builders
-        from egammaRec.LRTEgammaConfig import \
-            LRTelectronSuperClusterBuilder, LRTphotonSuperClusterBuilder
+        from egammaRec.LRTEgammaConfig import (
+            LRTelectronSuperClusterBuilder, LRTphotonSuperClusterBuilder)
         try:
             self._LRTelectronSuperClusterBuilder = LRTelectronSuperClusterBuilder(
                 doTrackMatching=DetFlags.detdescr.ID_on())
@@ -69,16 +49,9 @@ class LRTtopoEgammaGetter (Configured):
             return False
 
         # the topoEgammaBuilder (the part that puts everything together
-        from egammaRec.LRTEgammaConfig import LRTtopoEgammaBuilder, LRTEMClusterTool
+        from egammaRec.LRTEgammaConfig import LRTtopoEgammaBuilder
         try:
             self._LRTtopoEgammaBuilder = LRTtopoEgammaBuilder(
-                EMClusterTool=LRTEMClusterTool,
-                EMShowerTool=EMShowerBuilder,
-                ObjectQualityTool=egammaOQFlagsBuilder,
-                # Decoration tools
-                egammaTools=FcnWrapper(egammaDecorationTools),
-                ElectronTools=FcnWrapper(electronDecorationTools),
-                PhotonTools=FcnWrapper(photonDecorationTools),
                 doPhotons=False
             )
         except Exception:
@@ -87,16 +60,4 @@ class LRTtopoEgammaGetter (Configured):
             traceback.print_exc()
             return False
 
-#        # the egammaLargeClusterMaker
-#        # (Which chooses the cells to store in the AOD)
-#        from egammaAlgs.egammaLargeClusterMakerAlg import (
-#            egammaLargeClusterMakerAlg)
-#        try:
-#            self._egammaLargeClusterMaker = egammaLargeClusterMakerAlg()
-#        except Exception:
-#            mlog.error("could not get handle to egammaLargeClusterMaker")
-#            import traceback
-#            traceback.print_exc()
-#            return False
-
         return True
diff --git a/Reconstruction/egamma/egammaRec/python/egammaAODGetter.py b/Reconstruction/egamma/egammaRec/python/egammaAODGetter.py
index 44d7027ea218d462a84e589c890d2af34114488a..ce77b114612ec17597f8d64bc38483aa1c553a55 100755
--- a/Reconstruction/egamma/egammaRec/python/egammaAODGetter.py
+++ b/Reconstruction/egamma/egammaRec/python/egammaAODGetter.py
@@ -1,9 +1,6 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # xAOD this should do nothing
 # Exists just for compatibility
 class egammaAODGetter:
-  pass
-
-
-
+    pass
diff --git a/Simulation/G4Utilities/G4PhysicsLists/src/FTFP_BERT_ATL.hh b/Simulation/G4Utilities/G4PhysicsLists/src/FTFP_BERT_ATL.hh
deleted file mode 100644
index af02d838795574ea47298428a160044bce411d39..0000000000000000000000000000000000000000
--- a/Simulation/G4Utilities/G4PhysicsLists/src/FTFP_BERT_ATL.hh
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// ********************************************************************
-// * License and Disclaimer                                           *
-// *                                                                  *
-// * The  Geant4 software  is  copyright of the Copyright Holders  of *
-// * the Geant4 Collaboration.  It is provided  under  the terms  and *
-// * conditions of the Geant4 Software License,  included in the file *
-// * LICENSE and available at  http://cern.ch/geant4/license .  These *
-// * include a list of copyright holders.                             *
-// *                                                                  *
-// * Neither the authors of this software system, nor their employing *
-// * institutes,nor the agencies providing financial support for this *
-// * work  make  any representation or  warranty, express or implied, *
-// * regarding  this  software system or assume any liability for its *
-// * use.  Please see the license in the file  LICENSE  and URL above *
-// * for the full disclaimer and the limitation of liability.         *
-// *                                                                  *
-// * This  code  implementation is the result of  the  scientific and *
-// * technical work of the GEANT4 collaboration.                      *
-// * By using,  copying,  modifying or  distributing the software (or *
-// * any work based  on the software)  you  agree  to acknowledge its *
-// * use  in  resulting  scientific  publications,  and indicate your *
-// * acceptance of all terms of the Geant4 Software license.          *
-// ********************************************************************
-//
-// $Id$
-//
-//---------------------------------------------------------------------------
-// Author: Alberto Ribon
-// Date:   April 2016
-//
-// New physics list FTFP_BERT_ATL.
-// This is a modified version of the FTFP_BERT physics list for ATLAS.
-// The physics list FTFP_BERT_ATL has the transition between Bertini (BERT)
-// intra-nuclear cascade model and Fritiof (FTF) string model in the
-// energy region [9, 12] GeV (instead of [4, 5] GeV as in FTFP_BERT).
-//----------------------------------------------------------------------------
-//
-#ifndef TFTFP_BERT_ATL_h
-#define TFTFP_BERT_ATL_h 1
-
-#include <CLHEP/Units/SystemOfUnits.h>
-
-#include "globals.hh"
-#include "G4VModularPhysicsList.hh"
-#include "CompileTimeConstraints.hh"
-
-template<class T>
-class TFTFP_BERT_ATL: public T
-{
-public:
-  TFTFP_BERT_ATL(G4int ver = 1);
-  virtual ~TFTFP_BERT_ATL();
-  
-public:
-  // SetCuts() 
-  virtual void SetCuts();
-
-private:
-  enum {ok = CompileTimeConstraints::IsA<T, G4VModularPhysicsList>::ok };
-};
-#include "FTFP_BERT_ATL.icc"
-typedef TFTFP_BERT_ATL<G4VModularPhysicsList> FTFP_BERT_ATL;
-
-#endif
-
diff --git a/Simulation/G4Utilities/G4PhysicsLists/src/FTFP_BERT_ATL.icc b/Simulation/G4Utilities/G4PhysicsLists/src/FTFP_BERT_ATL.icc
deleted file mode 100644
index 7fd7cc8c33bfa7bccada7ad098d403ca0d37a5ab..0000000000000000000000000000000000000000
--- a/Simulation/G4Utilities/G4PhysicsLists/src/FTFP_BERT_ATL.icc
+++ /dev/null
@@ -1,111 +0,0 @@
-//
-// ********************************************************************
-// * License and Disclaimer                                           *
-// *                                                                  *
-// * The  Geant4 software  is  copyright of the Copyright Holders  of *
-// * the Geant4 Collaboration.  It is provided  under  the terms  and *
-// * conditions of the Geant4 Software License,  included in the file *
-// * LICENSE and available at  http://cern.ch/geant4/license .  These *
-// * include a list of copyright holders.                             *
-// *                                                                  *
-// * Neither the authors of this software system, nor their employing *
-// * institutes,nor the agencies providing financial support for this *
-// * work  make  any representation or  warranty, express or implied, *
-// * regarding  this  software system or assume any liability for its *
-// * use.  Please see the license in the file  LICENSE  and URL above *
-// * for the full disclaimer and the limitation of liability.         *
-// *                                                                  *
-// * This  code  implementation is the result of  the  scientific and *
-// * technical work of the GEANT4 collaboration.                      *
-// * By using,  copying,  modifying or  distributing the software (or *
-// * any work based  on the software)  you  agree  to acknowledge its *
-// * use  in  resulting  scientific  publications,  and indicate your *
-// * acceptance of all terms of the Geant4 Software license.          *
-// ********************************************************************
-//
-// $Id$
-//
-//---------------------------------------------------------------------------
-// Author: Alberto Ribon
-// Date:   April 2016
-//
-// New physics list FTFP_BERT_ATL.
-// This is a modified version of the FTFP_BERT physics list for ATLAS.
-// The physics list FTFP_BERT_ATL has the transition between Bertini (BERT)
-// intra-nuclear cascade model and Fritiof (FTF) string model in the
-// energy region [9, 12] GeV (instead of [4, 5] GeV as in FTFP_BERT).
-//----------------------------------------------------------------------------
-//
-#include <iomanip>   
-
-#include "globals.hh"
-#include "G4ios.hh"
-#include "G4ProcessManager.hh"
-#include "G4ProcessVector.hh"
-#include "G4ParticleTypes.hh"
-#include "G4ParticleTable.hh"
-
-#include "G4Material.hh"
-#include "G4MaterialTable.hh"
-
-#include "G4DecayPhysics.hh"
-#include "G4EmStandardPhysics.hh"
-#include "G4EmExtraPhysics.hh"
-#include "G4IonPhysics.hh"
-#include "G4StoppingPhysics.hh"
-#include "G4HadronElasticPhysics.hh"
-#include "G4NeutronTrackingCut.hh"
-
-#include "G4HadronPhysicsFTFP_BERT_ATL.hh"
-
-template<class T> TFTFP_BERT_ATL<T>::TFTFP_BERT_ATL(G4int ver):  T()
-{
-  // default cut value  (1.0mm) 
-  // defaultCutValue = 1.0*CLHEP::mm;
-  G4cout << "<<< Geant4 Physics List simulation engine: FTFP_BERT_ATL 2.0"<<G4endl;
-  G4cout <<G4endl;
-  this->defaultCutValue = 0.7*CLHEP::mm;  
-  this->SetVerboseLevel(ver);
-
- // EM Physics
-  this->RegisterPhysics( new G4EmStandardPhysics(ver));
-
-  // Synchroton Radiation & GN Physics
-  this->RegisterPhysics( new G4EmExtraPhysics(ver) );
-
-  // Decays 
-  this->RegisterPhysics( new G4DecayPhysics(ver) );
-
-   // Hadron Elastic scattering
-  this->RegisterPhysics( new G4HadronElasticPhysics(ver) );
-
-   // Hadron Physics
-  this->RegisterPhysics(  new G4HadronPhysicsFTFP_BERT_ATL(ver));
-
-  // Stopping Physics
-  this->RegisterPhysics( new G4StoppingPhysics(ver) );
-
-  // Ion Physics
-  this->RegisterPhysics( new G4IonPhysics(ver));
-  
-  // Neutron tracking cut
-  this->RegisterPhysics( new G4NeutronTrackingCut(ver));
-}
-
-template<class T> TFTFP_BERT_ATL<T>::~TFTFP_BERT_ATL()
-{
-}
-
-template<class T> void TFTFP_BERT_ATL<T>::SetCuts()
-{
-  if (this->verboseLevel >1){
-    G4cout << "FTFP_BERT_ATL::SetCuts:";
-  }  
-  //  " G4VUserPhysicsList::SetCutsWithDefault" method sets 
-  //   the default cut value for all particle types 
-
-  this->SetCutsWithDefault();   
- 
-//  if (this->verboseLevel > 0)
-//    G4VUserPhysicsList::DumpCutValuesTable();  
-}
diff --git a/Simulation/SimuJobTransforms/share/CommonSkeletonJobOptions.py b/Simulation/SimuJobTransforms/share/CommonSkeletonJobOptions.py
index f25b14d8815e7ec66e3f89d3a62688d2373bfc18..791a3031c5bdcd11f52723c528cce137d27dd870 100644
--- a/Simulation/SimuJobTransforms/share/CommonSkeletonJobOptions.py
+++ b/Simulation/SimuJobTransforms/share/CommonSkeletonJobOptions.py
@@ -37,10 +37,6 @@ if hasattr(runArgs,"beamType"):
 if hasattr(runArgs, "eventService") and runArgs.eventService:
     import AthenaMP.EventService
 
-# Disable this while MC still uses old alignment folders
-from AtlasGeoModel.InDetGMJobProperties import InDetGeometryFlags
-InDetGeometryFlags.useDynamicAlignFolders=False
-
 ## autoConfiguration keywords triggering pre-defined functions
 ## if hasattr(runArgs,"autoConfiguration"):
 ##     for key in runArgs.autoConfiguration:
diff --git a/Tracking/TrkAlgorithms/TrkTrackSummaryUpdater/src/components/TrkTrackSummaryUpdater_entries.cxx b/Tracking/TrkAlgorithms/TrkTrackSummaryUpdater/src/components/TrkTrackSummaryUpdater_entries.cxx
index 40c34fef6ad154109700e2cd43a0cc3863d565b7..80e5e3956fd049e026184bb5ec1af94f3526f41d 100644
--- a/Tracking/TrkAlgorithms/TrkTrackSummaryUpdater/src/components/TrkTrackSummaryUpdater_entries.cxx
+++ b/Tracking/TrkAlgorithms/TrkTrackSummaryUpdater/src/components/TrkTrackSummaryUpdater_entries.cxx
@@ -1,10 +1,8 @@
 
 #include "TrkTrackSummaryUpdater/TrackSummaryUpdater.h"
 #include "test/SummaryToolStub.h"
-#include "test/PutTrackCollectionsInSG.h"
 
 DECLARE_COMPONENT( Trk::TrackSummaryUpdater )
 DECLARE_COMPONENT(SummaryToolStub)
-DECLARE_COMPONENT( PutTrackCollectionsInSG )
 
 
diff --git a/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool.cxx b/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool.cxx
index 25ef5578cefaaaeb601e60cf3ef15896a089269e..a0fed546a8c4d174fd7ec69491a0a7c8e76417c3 100644
--- a/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool.cxx
+++ b/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool.cxx
@@ -388,7 +388,6 @@ StatusCode HLTTauMonTool::fill() {
 
     // good reco taus
   //m_taus.clear();
-  m_taus_BDT.clear();
   m_taus_RNN.clear();
   m_tauCont = 0;
   sc = evtStore()->retrieve(m_tauCont, "TauJets");
@@ -408,12 +407,14 @@ StatusCode HLTTauMonTool::fill() {
         if(pt_Tau<m_effOffTauPtCut) continue;
         int ntrack_TAU = (*offlinetau)->nTracks();
         if(ntrack_TAU!=1 && ntrack_TAU!=3) continue;
-        bool good_tau_BDT = (*offlinetau)->isTau(xAOD::TauJetParameters::JetBDTSigMedium);
         bool good_tau_RNN = (*offlinetau)->isTau(xAOD::TauJetParameters::JetRNNSigMedium);
         if(!Selection(*offlinetau)) continue;
-        if( !(good_tau_BDT || good_tau_RNN) ) continue;
-        if (good_tau_BDT) m_taus_BDT.push_back( *offlinetau );
-        if (good_tau_RNN) m_taus_RNN.push_back( *offlinetau );
+        if( !(good_tau_RNN) ) {    
+            continue;
+        }
+        else {  
+            m_taus_RNN.push_back( *offlinetau );
+        }
       }
     }
   } //end if_else !sc.isSuccess() 
@@ -438,51 +439,53 @@ StatusCode HLTTauMonTool::fill() {
     //testL1TopoNavigation(m_trigItems[j]);
     //testPrescaleRetrieval(m_trigItems[j]);
 
-                        bool monRNN (false);
-                        for (unsigned int i=0; i<m_trigRNN_chains.size(); i++) {
-                                if ( m_trigItems[j] == m_trigRNN_chains.at(i) ) {
-                                  monRNN = true;
-                                  break;
-                                }
-                        }
-                        bool monBDT (false);
-                        for (unsigned int i=0; i<m_trigBDTRNN_chains.size(); i++) {
-                                if ( m_trigItems[j] == m_trigBDTRNN_chains.at(i) ) {
-                                  if (!monRNN) monRNN = true;
-                                  if (!monBDT) monBDT = true;
-                                  break;
-                                }
-                        } 
-                        if ( (!monBDT) && (!monRNN) ) monBDT=true; // if the chain is not listed in BDTRNN, but it is also not in RNN, then it is BDT 
+   bool monRNN (false);
+   for (unsigned int i=0; i<m_trigRNN_chains.size(); i++) {
+       if ( m_trigItems[j] == m_trigRNN_chains.at(i) ) {
+           monRNN = true;
+           break;
+       }
+   }
+                        
+   bool monBDT (false);
+   for (unsigned int i=0; i<m_trigBDTRNN_chains.size(); i++) {
+       if ( m_trigItems[j] == m_trigBDTRNN_chains.at(i) ) {
+           if (!monRNN) monRNN = true;
+           if (!monBDT) monBDT = true;
+           break;
+       }
+   } 
+                        
+   if ( (!monBDT) && (!monRNN) ) monBDT=true; // if the chain is not listed in BDTRNN, but it is also not in RNN, then it is BDT 
         
-                        std::string goodTauRefType;
-                        if (monRNN) {
-                                goodTauRefType = "RNN";
-                        } else {
-                                goodTauRefType = "BDT";
-                        }
+   std::string goodTauRefType;
+   if (monRNN) {
+       goodTauRefType = "RNN";
+   } else {
+       goodTauRefType = "BDT";
+   }
 
-      // muCut on Filling the Histograms
-      if (m_muCut40Passed)
-        {
-	  sc = fillHistogramsForItem(m_trigItems[j], monRNN, monBDT, goodTauRefType);
-    if(!sc.isSuccess()){ ATH_MSG_WARNING("Failed at fillHistogramsForItem"); } //return sc;}  
-    if(m_doTrackCurves){
+   // muCut on Filling the Histograms
+   if (m_muCut40Passed)
+   {
+        sc = fillHistogramsForItem(m_trigItems[j], monRNN, monBDT);
+        if(!sc.isSuccess()){ ATH_MSG_WARNING("Failed at fillHistogramsForItem"); } //return sc;}  
+        if(m_doTrackCurves){
             sc = trackCurves (m_trigItems[j], goodTauRefType);
             if(!sc.isSuccess()){ ATH_MSG_WARNING("Failed trackCurves()"); } //return sc;}
-          }
+        }
     // if(m_doEfficiencyRatioPlots){
     //      sc = efficiencyRatioPlots (m_trigItems[j], goodTauRefType);
     //      if(!sc.isSuccess()){ ATH_MSG_WARNING("Failed efficiencyRatioPlots()"); } //return sc;}
     //    }
-        }
-      else
-        {
-          ATH_MSG_WARNING("Pileup Cut 40 was not passed. Skipped: HistogramsForItem"); 
-        } 
+   }
+   else
+   {
+        ATH_MSG_WARNING("Pileup Cut 40 was not passed. Skipped: HistogramsForItem"); 
+   } 
 
 
-    }
+  }
 
   // do L1TopoLeptons
   for(unsigned int i=0;i<m_topo_chains.size(); ++i){
@@ -634,7 +637,7 @@ void HLTTauMonTool::cloneHistogram2(const std::string name, const std::string fo
 }
 
 
-StatusCode HLTTauMonTool::fillHistogramsForItem(const std::string & trigItem, const bool & monRNN, const bool & monBDT, const std::string & goodTauRefType){
+StatusCode HLTTauMonTool::fillHistogramsForItem(const std::string & trigItem, const bool & monRNN, const bool & monBDT){
     
   ATH_MSG_DEBUG ("HLTTauMonTool::fillHistogramsForItem " << trigItem);
     
@@ -679,7 +682,7 @@ StatusCode HLTTauMonTool::fillHistogramsForItem(const std::string & trigItem, co
       ATH_CHECK(fillL1Tau(*itEMTau)); 
       setCurrentMonGroup("HLT/TauMon/Expert/"+trigItemShort+"/L1VsOffline");
       ATH_MSG_DEBUG("Check if L1VsOffline group exists");
-      ATH_CHECK(fillL1TauVsOffline(*itEMTau, goodTauRefType));
+      ATH_CHECK(fillL1TauVsOffline(*itEMTau));
     }
     const xAOD::TauJetContainer * tauJetCont = 0;
     StatusCode sc = evtStore()->retrieve(tauJetCont, "HLT_xAOD__TauJetContainer_TrigTauRecMerged");
@@ -712,10 +715,10 @@ StatusCode HLTTauMonTool::fillHistogramsForItem(const std::string & trigItem, co
         sc = fillEFTau(*CI, trigItem, "RNN_out", monRNN, monBDT);
         if(!sc.isSuccess()){ ATH_MSG_WARNING("Failed to Fill RNN input and output histograms for fillEFTau(). Exiting!"); return sc;}
       }
-      sc = fillEFTauVsOffline(*CI, trigItem, "basicVars", goodTauRefType);
+      sc = fillEFTauVsOffline(*CI, trigItem, "basicVars");
       if (monBDT) {
-        sc = fillEFTauVsOffline(*CI, trigItem, "1p_NonCorr", goodTauRefType);
-        sc = fillEFTauVsOffline(*CI, trigItem, "mp_NonCorr", goodTauRefType);
+        sc = fillEFTauVsOffline(*CI, trigItem, "1p_NonCorr");
+        sc = fillEFTauVsOffline(*CI, trigItem, "mp_NonCorr");
       }
       if(!sc.isSuccess()){ ATH_MSG_WARNING("Failed to Fill histograms for fillEFTauVsOffline(). Exiting!"); return sc;}
     }
@@ -787,7 +790,7 @@ StatusCode HLTTauMonTool::fillHistogramsForItem(const std::string & trigItem, co
                     return sc;
                   }
                   setCurrentMonGroup("HLT/TauMon/Expert/"+trigItem+"/L1VsOffline");
-                  sc = fillL1TauVsOffline(*itEMTau, goodTauRefType);
+                  sc = fillL1TauVsOffline(*itEMTau);
                   if(!sc.isSuccess()){ 
                     ATH_MSG_WARNING("Failed to fill L1VsOffline histo. Exiting!"); 
                     return sc;
@@ -849,7 +852,7 @@ StatusCode HLTTauMonTool::fillHistogramsForItem(const std::string & trigItem, co
                 return sc;
               }
               setCurrentMonGroup("HLT/TauMon/Expert/"+trigItemShort+"/L1VsOffline");
-              sc = fillL1TauVsOffline(*itEMTau,goodTauRefType);
+              sc = fillL1TauVsOffline(*itEMTau);
               if(!sc.isSuccess()){ 
                 ATH_MSG_WARNING("Failed to fill L1VsOffline histo. Exiting!"); 
                 return sc;
@@ -929,7 +932,7 @@ StatusCode HLTTauMonTool::fillHistogramsForItem(const std::string & trigItem, co
                   ATH_CHECK(fillPreselTau(*tauItr));
 
                   setCurrentMonGroup("HLT/TauMon/Expert/"+trigItem+"/PreselectionVsOffline");
-                  ATH_CHECK(fillPreselTauVsOffline(*tauItr, goodTauRefType));
+                  ATH_CHECK(fillPreselTauVsOffline(*tauItr));
                 }
               }
             }
@@ -972,10 +975,10 @@ StatusCode HLTTauMonTool::fillHistogramsForItem(const std::string & trigItem, co
                 if(!sc.isSuccess()){ ATH_MSG_WARNING("Failed to Fill RNN input and output histograms for fillEFTau(). Exiting!"); return sc;}
               }
               if(m_truth) if(*tauItr) sc = fillEFTauVsTruth(*tauItr, trigItem);
-              if(*tauItr) sc = fillEFTauVsOffline(*tauItr, trigItem, "basicVars", goodTauRefType);
+              if(*tauItr) sc = fillEFTauVsOffline(*tauItr, trigItem, "basicVars");
               if (monBDT) {
-                if(*tauItr) sc = fillEFTauVsOffline(*tauItr, trigItem, "1p_NonCorr", goodTauRefType);
-                if(*tauItr) sc = fillEFTauVsOffline(*tauItr, trigItem, "mp_NonCorr", goodTauRefType);
+                if(*tauItr) sc = fillEFTauVsOffline(*tauItr, trigItem, "1p_NonCorr");
+                if(*tauItr) sc = fillEFTauVsOffline(*tauItr, trigItem, "mp_NonCorr");
               }
               if(!sc.isSuccess()){ ATH_MSG_WARNING("Failed to Fill histograms for fillEFTauVsOffline(). Exiting!"); return sc;}
             }
@@ -1008,7 +1011,7 @@ StatusCode HLTTauMonTool::fillHistogramsForItem(const std::string & trigItem, co
           setCurrentMonGroup("HLT/TauMon/Expert/"+trigItemShort+"/PreselectionTau");
           ATH_CHECK(fillPreselTau(*tauJetEL));
           setCurrentMonGroup("HLT/TauMon/Expert/"+trigItemShort+"/PreselectionVsOffline");
-          ATH_CHECK(fillPreselTauVsOffline(*tauJetEL, goodTauRefType));
+          ATH_CHECK(fillPreselTauVsOffline(*tauJetEL));
         } // end comb loop
 
         const std::vector< TrigCompositeUtils::LinkInfo<xAOD::TauJetContainer> > featuresMerged
@@ -1043,10 +1046,10 @@ StatusCode HLTTauMonTool::fillHistogramsForItem(const std::string & trigItem, co
 	    if(!sc.isSuccess()){ ATH_MSG_WARNING("Failed to Fill RNN input and output histograms for fillEFTau(). Exiting!"); return sc;}
 	  }
 	  if(m_truth) if(*tauJetEL) sc = fillEFTauVsTruth(*tauJetEL, trigItem);
-	  if(*tauJetEL) sc = fillEFTauVsOffline(*tauJetEL, trigItem, "basicVars", goodTauRefType);
+	  if(*tauJetEL) sc = fillEFTauVsOffline(*tauJetEL, trigItem, "basicVars");
 	  if (monBDT) {
-	    if(*tauJetEL) sc = fillEFTauVsOffline(*tauJetEL, trigItem, "1p_NonCorr", goodTauRefType);
-	    if(*tauJetEL) sc = fillEFTauVsOffline(*tauJetEL, trigItem, "mp_NonCorr", goodTauRefType);
+	    if(*tauJetEL) sc = fillEFTauVsOffline(*tauJetEL, trigItem, "1p_NonCorr");
+	    if(*tauJetEL) sc = fillEFTauVsOffline(*tauJetEL, trigItem, "mp_NonCorr");
 	  }
 	  if(!sc.isSuccess()){ ATH_MSG_WARNING("Failed to Fill histograms for fillEFTauVsOffline(). Exiting!"); return sc;}
 	  
@@ -1124,13 +1127,13 @@ StatusCode HLTTauMonTool::fillHistogramsForItem(const std::string & trigItem, co
     
   if( m_turnOnCurves) {
     if(m_truth){ 
-      sc = TruthTauEfficiency(trigItem, "Truth", goodTauRefType);
+      sc = TruthTauEfficiency(trigItem, "Truth");
       if(!sc.isSuccess()){ ATH_MSG_WARNING("Failed to fill Truth eff curves");} //return StatusCode::FAILURE;}
-      sc = TruthTauEfficiency(trigItem, "Truth+Reco", goodTauRefType);
+      sc = TruthTauEfficiency(trigItem, "Truth+Reco");
       if(!sc.isSuccess()){ ATH_MSG_WARNING("Failed to fill Truth+Reco eff curves");} //return StatusCode::FAILURE;}
     }
 
-    sc = TauEfficiency(trigItem,m_turnOnCurvesDenom, goodTauRefType);
+    sc = TauEfficiency(trigItem,m_turnOnCurvesDenom);
     if(!sc.isSuccess()){ ATH_MSG_WARNING("Failed to fill Reco eff curves"); } //return StatusCode::FAILURE;}
     //      if(m_truth) sc = TauEfficiencyCombo(trigItem);
     //      if(sc.isFailure()){ ATH_MSG_WARNING("Failed to fill combo eff curves. Exiting!"); return StatusCode::FAILURE;}
@@ -1847,7 +1850,7 @@ StatusCode HLTTauMonTool::fillEFTau(const xAOD::TauJet *aEFTau, const std::strin
   return StatusCode::SUCCESS;
 }
 
-StatusCode HLTTauMonTool::fillL1TauVsOffline(const xAOD::EmTauRoI *aL1Tau, const std::string & goodTauRefType){
+StatusCode HLTTauMonTool::fillL1TauVsOffline(const xAOD::EmTauRoI *aL1Tau){
 
   ATH_MSG_DEBUG ("HLTTauMonTool::fillL1TauVsOffline");
     
@@ -1857,11 +1860,8 @@ StatusCode HLTTauMonTool::fillL1TauVsOffline(const xAOD::EmTauRoI *aL1Tau, const
   }
 
   std::vector<const xAOD::TauJet *> taus_here;
-  if (goodTauRefType == "RNN") {
-    taus_here = m_taus_RNN;
-  } else {
-    taus_here = m_taus_BDT;
-  }
+    
+  taus_here = m_taus_RNN;
 
   const xAOD::TauJet *aOfflineTau = 0;
   float tmpR = 0.3;
@@ -1889,7 +1889,7 @@ StatusCode HLTTauMonTool::fillL1TauVsOffline(const xAOD::EmTauRoI *aL1Tau, const
 }
 
 
-StatusCode HLTTauMonTool::fillPreselTauVsOffline(const xAOD::TauJet *aEFTau, const std::string & goodTauRefType){
+StatusCode HLTTauMonTool::fillPreselTauVsOffline(const xAOD::TauJet *aEFTau){
     
     ATH_MSG_DEBUG ("HLTTauMonTool::fillPreselTauVsOffline");
     
@@ -1900,11 +1900,8 @@ StatusCode HLTTauMonTool::fillPreselTauVsOffline(const xAOD::TauJet *aEFTau, con
 
     
     std::vector<const xAOD::TauJet *> taus_here;
-    if (goodTauRefType == "RNN") {
-      taus_here = m_taus_RNN;
-    } else {
-      taus_here = m_taus_BDT;
-    }
+    
+    taus_here = m_taus_RNN;
 
 
     
@@ -1991,7 +1988,7 @@ StatusCode HLTTauMonTool::fillEFTauVsTruth(const xAOD::TauJet *aEFTau, const std
   return StatusCode::SUCCESS;
 }
 
-StatusCode HLTTauMonTool::fillEFTauVsOffline(const xAOD::TauJet *aEFTau, const std::string & trigItem, const std::string & BDTinput_type, const std::string & goodTauRefType)
+StatusCode HLTTauMonTool::fillEFTauVsOffline(const xAOD::TauJet *aEFTau, const std::string & trigItem, const std::string & BDTinput_type)
 {
   ATH_MSG_DEBUG ("HLTTauMonTool::fillEFTauVsOffline");
   if(!aEFTau)
@@ -2001,11 +1998,7 @@ StatusCode HLTTauMonTool::fillEFTauVsOffline(const xAOD::TauJet *aEFTau, const s
     }
 
   std::vector<const xAOD::TauJet *> taus_here;
-  if (goodTauRefType == "RNN") {
-    taus_here = m_taus_RNN;
-  } else {
-    taus_here = m_taus_BDT;
-  }
+  taus_here = m_taus_RNN;
 
  
   float innerTrkAvgDist = 0;
@@ -2797,7 +2790,7 @@ StatusCode HLTTauMonTool::examineTruthTau(const xAOD::TruthParticle& xTruthTau)
 }
 
 
-StatusCode HLTTauMonTool::TauEfficiency(const std::string & trigItem, const std::string & TauDenom, const std::string & goodTauRefType){
+StatusCode HLTTauMonTool::TauEfficiency(const std::string & trigItem, const std::string & TauDenom){
   ATH_MSG_DEBUG("Efficiency wrt "<< TauDenom << " for trigItem" << trigItem);
   if(trigItem == "Dump") {ATH_MSG_DEBUG("Not computing efficiencies for Dump"); return StatusCode::SUCCESS;};
 
@@ -2809,11 +2802,8 @@ StatusCode HLTTauMonTool::TauEfficiency(const std::string & trigItem, const std:
   std::vector<TLorentzVector> tlv_tmp;
 
   std::vector<const xAOD::TauJet *> taus_here;
-  if (goodTauRefType == "RNN") {
-    taus_here = m_taus_RNN;
-  } else {
-    taus_here = m_taus_BDT;
-  }
+    
+  taus_here = m_taus_RNN;
 
   float mu(m_mu_offline);
   int nvtx(PrimaryVertices());
@@ -3432,7 +3422,7 @@ StatusCode HLTTauMonTool::TauEfficiency(const std::string & trigItem, const std:
 // return StatusCode::SUCCESS;
 //}
 
-StatusCode HLTTauMonTool::TruthTauEfficiency(const std::string & trigItem, const std::string & TauCont_type, const std::string & goodTauRefType)
+StatusCode HLTTauMonTool::TruthTauEfficiency(const std::string & trigItem, const std::string & TauCont_type)
 {
   ATH_MSG_DEBUG("Truth Tau Matching to Offline and Online Taus for trigItem" << trigItem);
   
@@ -3450,11 +3440,8 @@ StatusCode HLTTauMonTool::TruthTauEfficiency(const std::string & trigItem, const
   std::vector<bool> truthReco_matched_to_L1;
   std::vector<bool> truthReco_matched_to_hlt;
   std::vector<const xAOD::TauJet *> taus_here;
-  if (goodTauRefType == "RNN") {
-    taus_here = m_taus_RNN;
-  } else {
-    taus_here = m_taus_BDT;
-  }
+    
+  taus_here = m_taus_RNN;
 
   for(unsigned int truth=0;truth<m_true_taus.size();truth++){
 
diff --git a/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool.h b/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool.h
index de0f548aed1dbc27700465bfb5865e40c4b30952..9ed86d39147108146ac3fd5a23c971c87eeead1f 100644
--- a/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool.h
+++ b/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool.h
@@ -69,7 +69,7 @@ class HLTTauMonTool : public IHLTMonTool {
 //#endif
 
   /// Method fills the histograms for one tau trigger item.
-  StatusCode fillHistogramsForItem(const std::string & trigItem, const bool & monRNN, const bool & monBDT, const std::string & goodTauRefType); 
+  StatusCode fillHistogramsForItem(const std::string & trigItem, const bool & monRNN, const bool & monBDT); 
   
  private:
 
@@ -87,9 +87,9 @@ class HLTTauMonTool : public IHLTMonTool {
   StatusCode fillPreselTau(const xAOD::TauJet *aEFTau);
   StatusCode fillEFTau(const xAOD::TauJet *aEFTau, const std::string & trigItem, const std::string & BDTinput_type, const bool & monRNN, const bool & monBDT);
   /// Method filling the EF vs Offline tau histograms
-  StatusCode fillEFTauVsOffline(const xAOD::TauJet *aEFTau, const std::string & trigItem, const std::string & BDTinput_type, const std::string & goodTauRefType);
-  StatusCode fillPreselTauVsOffline(const xAOD::TauJet *aEFTau, const std::string & goodTauRefType);
-  StatusCode fillL1TauVsOffline(const xAOD::EmTauRoI *aEFTau, const std::string & goodTauRefType);
+  StatusCode fillEFTauVsOffline(const xAOD::TauJet *aEFTau, const std::string & trigItem, const std::string & BDTinput_type);
+  StatusCode fillPreselTauVsOffline(const xAOD::TauJet *aEFTau);
+  StatusCode fillL1TauVsOffline(const xAOD::EmTauRoI *aEFTau);
   StatusCode fillEFTauVsTruth(const xAOD::TauJet *aEFTau, const std::string & trigItem);  
   StatusCode fillTopoValidation(const std::string & trigItem_topo, const std::string & trigItem_support);
 
@@ -98,9 +98,9 @@ class HLTTauMonTool : public IHLTMonTool {
 
   /// Method for Turn On Curves
   StatusCode examineTruthTau(const xAOD::TruthParticle& xTruthParticle) const;
-  StatusCode TruthTauEfficiency(const std::string & trigItem, const std::string & TauCont_type, const std::string & goodTauRefType);
+  StatusCode TruthTauEfficiency(const std::string & trigItem, const std::string & TauCont_type);
   StatusCode RecoTauEfficiency(const std::string & trigItem);
-  StatusCode TauEfficiency(const std::string & trigItem, const std::string & TauDenom, const std::string & goodTauRefType);
+  StatusCode TauEfficiency(const std::string & trigItem, const std::string & TauDenom);
 //  StatusCode TauEfficiencyCombo(const std::string & trigItem);
 
   StatusCode RealZTauTauEfficiency(const std::string & goodTauRefType);
diff --git a/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool_dijet.cxx b/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool_dijet.cxx
index 15b91fe01c96100e0c156e1c3b89df421f1e6654..c028460fafc0f44f8c7f93e296b8ba8d65633a4a 100644
--- a/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool_dijet.cxx
+++ b/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool_dijet.cxx
@@ -116,9 +116,9 @@ StatusCode HLTTauMonTool::dijetFakeTausEfficiency()
       if(!trackMatch) continue;
 
       if( offlineTauIDCut=="") ;
-      else if( offlineTauIDCut=="loose")  {if( !aTau->isTau(xAOD::TauJetParameters::JetBDTSigLoose) ) continue;}
-      else if( offlineTauIDCut=="medium") {if( !aTau->isTau(xAOD::TauJetParameters::JetBDTSigMedium) ) continue;}
-      else if( offlineTauIDCut=="tight")  {if( !aTau->isTau(xAOD::TauJetParameters::JetBDTSigTight) ) continue;}
+      else if( offlineTauIDCut=="loose")  {if( !aTau->isTau(xAOD::TauJetParameters::JetRNNSigLoose) ) continue;}
+      else if( offlineTauIDCut=="medium") {if( !aTau->isTau(xAOD::TauJetParameters::JetRNNSigMedium) ) continue;}
+      else if( offlineTauIDCut=="tight")  {if( !aTau->isTau(xAOD::TauJetParameters::JetRNNSigTight) ) continue;}
 
       /* match to subleading jet*/
       float temp_dR=subleadingJetTLV.DeltaR(aTau->p4());
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoRDOTrig_mt1_build.py b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoRDOTrig_mt1_build.py
deleted file mode 100755
index f01adecf1a3a33f49c7da8b971933d28d0202c37..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoRDOTrig_mt1_build.py
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-#
-# flake8: noqa
-# This is just a hacky link to a renamed test script, which is needed until the test name in CI configuration is updated
-test_trigAna_RDOtoRDOTrig_v1Dev_build.py
-exit_code=$?
-exit ${exit_code}
diff --git a/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetNewArtSteps.py b/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetNewArtSteps.py
index 82d2a11168f63c8386369661669b877b3a5ad83e..f36db2004b19a85072b1e23f66e649aaf443b880 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetNewArtSteps.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetNewArtSteps.py
@@ -63,7 +63,7 @@ class TrigInDetReco(ExecStep):
         # get the cuttent atlas base release, and the previous base release
         import os
         DVERSION=os.getenv('Athena_VERSION')
-        if ( DVERSION == None ) : 
+        if ( DVERSION is None ) :
             AVERSION = "22.0.20"
         else :
             BASE=DVERSION[:5]
@@ -190,7 +190,7 @@ class TrigInDetCompStep(RefComparisonStep):
     '''
     def __init__( self, name='TrigInDetComp', slice=None, args=None, file=None, reference=None ):
         super(TrigInDetCompStep, self).__init__(name)
-        if reference == None : 
+        if reference is None :
             self.reference  = file # do we need this any more ??? 
             self.args  = args + " " + file + "  " + file + " --noref --oldrms "
         else:
@@ -231,7 +231,7 @@ class TrigInDetCpuCostStep(RefComparisonStep):
     
     def configure(self, test):
         #self.args += self.input_file+' '+self.ref_file+' '+' -o '+self.output_dir
-        if (self.reference == None):
+        if (self.reference is None):
             ## if not reference found, run with "--noref" option
             self.args += ' {} --noref -o {} -p TIME'.format(self.input_file,self.output_dir)
         else:
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_bjet_nopps_pu40.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_bjet_nopps_pu40.py
new file mode 100755
index 0000000000000000000000000000000000000000..850c9adf65f4b1f03c11fae83f36d99f618a2074
--- /dev/null
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_bjet_nopps_pu40.py
@@ -0,0 +1,45 @@
+#!/usr/bin/env python
+
+# art-description: art job for bjet_pu40_mt
+# art-type: grid
+# art-include: master/Athena
+# art-input-nfiles: 3
+# art-athena-mt: 4
+# art-memory: 4096
+# art-html: https://idtrigger-val.web.cern.ch/idtrigger-val/TIDAWeb/TIDAart/?jobdir=
+# art-output: *.txt
+# art-output: *.log
+# art-output: log.*
+# art-output: *.out
+# art-output: *.err
+# art-output: *.log.tar.gz
+# art-output: *.new
+# art-output: *.json
+# art-output: *.root
+# art-output: *.check*
+# art-output: HLT*
+# art-output: times*
+# art-output: cost-perCall
+# art-output: cost-perEvent
+# art-output: cost-perCall-chain
+# art-output: cost-perEvent-chain
+# art-output: *.dat 
+
+import os
+os.system("echo 'ftf = findAlgorithm(topSequence, \"TrigFastTrackFinder__jet\")' > dopps.py")
+os.system("echo 'ftf.TripletDoPPS=False' >> dopps.py")
+
+Slices = ['bjet']
+RunEF   = True
+Events  = 4000
+Threads = 8 
+Slots   = 8
+postinclude_file = 'dopps.py'
+Input = 'ttbar_ID'    # defined in TrigValTools/share/TrigValInputs.json  
+
+TrackReference = [ 'Truth', 'Offline' ]
+
+
+from AthenaCommon.Include import include 
+include("TrigInDetValidation/TrigInDetValidation_Base.py")
+
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_nopps_pu40.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_nopps_pu40.py
new file mode 100755
index 0000000000000000000000000000000000000000..bed747938cc0d3335e84282b97744c1c597d7c0c
--- /dev/null
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_nopps_pu40.py
@@ -0,0 +1,55 @@
+#!/usr/bin/env python
+
+# art-description: art job for fsjet_pu40_new
+# art-type: grid
+# art-include: master/Athena
+# art-input-nfiles: 3
+# art-athena-mt: 8
+# art-memory: 4096
+# art-html: https://idtrigger-val.web.cern.ch/idtrigger-val/TIDAWeb/TIDAart/?jobdir=
+# art-output: *.txt
+# art-output: *.log
+# art-output: log.*
+# art-output: *.out
+# art-output: *.err
+# art-output: *.log.tar.gz
+# art-output: *.new
+# art-output: *.json
+# art-output: *.root
+# art-output: *.check*
+# art-output: HLT*
+# art-output: times*
+# art-output: cost-perCall
+# art-output: cost-perEvent
+# art-output: cost-perCall-chain
+# art-output: cost-perEvent-chain
+# art-output: *.dat 
+
+import os
+os.system("echo 'ftf = findAlgorithm(topSequence, \"TrigFastTrackFinder__jet\")' > dopps.py")
+os.system("echo 'ftf.TripletDoPPS=False' >> dopps.py")
+
+Slices  = ['fsjet']
+RunEF   = False
+Events  = 2000 
+Threads = 8 
+Slots   = 8
+postinclude_file = 'dopps.py'
+Input   = 'ttbar'    # defined in TrigValTools/share/TrigValInputs.json  
+
+Jobs = [ ( "Truth",       " TIDAdata-run3.dat              -o data-hists.root" ), 
+         ( "Offline",     " TIDAdata-run3-offline.dat      -o data-hists-offline.root" ),
+         ( "OfflineVtx",  " TIDAdata-run3-offline-vtx.dat  -o data-hists-offline-vtx.root" ) ]
+
+
+Comp = [ ( "FSjet",        "L2fsjet",     "data-hists.root",              " -c TIDAhisto-panel.dat      -d HLTL2-plots " ),
+         ( "FSjetoffline", "L2fsjet",     "data-hists-offline.root",      " -c TIDAhisto-panel.dat      -d HLTL2-plots-offline " ),
+         ( "FSvtx",        "L2fsjetvtx",  "data-hists-offline-vtx.root",  " -c TIDAhisto-panel-vtx.dat  -d HLTL2-plots-vtx     --ncols 3" ),
+         ( "FSvtxall",     "L2fsjetvtx",  "data-hists-offline.root",      " -c TIDAhisto-panel-vtx.dat  -d HLTL2-plots-vtxall  --ncols 3" ) ]
+
+
+from AthenaCommon.Include import include 
+include("TrigInDetValidation/TrigInDetValidation_NewBase.py")
+
+
+ 
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_grid.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_grid.py
index 777044199df5ef2d5a047a39ef0743ff1db59641..4e806448361a610ff5c2fec6b12b939bd094030b 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_grid.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_grid.py
@@ -4,6 +4,7 @@
 # art-description: Trigger RDO->RDO_TRIG athena test of the Dev_pp_run3_v1 menu
 # art-type: grid
 # art-include: master/Athena
+# art-athena-mt: 4
 # art-output: *.txt
 # art-output: *.log
 # art-output: log.*
@@ -24,7 +25,8 @@ ex = ExecStep.ExecStep()
 ex.type = 'athena'
 ex.job_options = 'TriggerJobOpts/runHLT_standalone.py'
 ex.input = 'ttbar'
-ex.threads = 1
+ex.threads = 4
+ex.concurrent_events = 4
 # LS2_v1 soon to be renamed to Dev_pp_run3_v1
 ex.args = '-c "setMenu=\'LS2_v1_TriggerValidation_mc_prescale\';doWriteBS=False;doWriteRDOTrigger=True;"'
 
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_pu80_grid.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_pu80_grid.py
index 59cae14f1c5fb857e1e3d6c97c3e6028b9c57d6d..b44906f430bf9a6542815ed84b1f8958efc47eb2 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_pu80_grid.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_pu80_grid.py
@@ -4,6 +4,7 @@
 # art-description: Trigger RDO->RDO_TRIG athena test of the Dev_pp_run3_v1 menu with pileup80 ttbar sample
 # art-type: grid
 # art-include: master/Athena
+# art-athena-mt: 4
 # art-output: *.txt
 # art-output: *.log
 # art-output: log.*
@@ -24,7 +25,8 @@ ex = ExecStep.ExecStep()
 ex.type = 'athena'
 ex.job_options = 'TriggerJobOpts/runHLT_standalone.py'
 ex.input = 'ttbar_pu80'
-ex.threads = 1
+ex.threads = 4
+ex.concurrent_events = 4
 # LS2_v1 soon to be renamed to Dev_pp_run3_v1
 ex.args = '-c "setMenu=\'LS2_v1_TriggerValidation_mc_prescale\';doWriteBS=False;doWriteRDOTrigger=True;"'
 
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_writeBS_grid.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_writeBS_grid.py
index dbea883df517d7009893fe7ae475cade00e7025d..d25b9b9371ef627b4815e650ae2e8a781631f3b2 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_writeBS_grid.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_writeBS_grid.py
@@ -4,6 +4,7 @@
 # art-description: Trigger RDO->BS athena test of the Dev_pp_run3_v1 menu
 # art-type: grid
 # art-include: master/Athena
+# art-athena-mt: 4
 # art-output: *.txt
 # art-output: *.log
 # art-output: log.*
@@ -25,7 +26,8 @@ ex = ExecStep.ExecStep()
 ex.type = 'athena'
 ex.job_options = 'TriggerJobOpts/runHLT_standalone.py'
 ex.input = 'ttbar'
-ex.threads = 1
+ex.threads = 4
+ex.concurrent_events = 4
 # LS2_v1 soon to be renamed to Dev_pp_run3_v1
 ex.args = '-c "setMenu=\'LS2_v1_TriggerValidation_mc_prescale\';doWriteBS=True;doWriteRDOTrigger=False;"'
 
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1MC_grid.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1MC_grid.py
index 07af8bc468f483cee70105a1f33553f41be3ae03..bbd854cd380249b12b9186ad01d47904c98b66bd 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1MC_grid.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1MC_grid.py
@@ -4,6 +4,7 @@
 # art-description: Trigger RDO->RDO_TRIG athena test of the MC_pp_run3_v1 menu
 # art-type: grid
 # art-include: master/Athena
+# art-athena-mt: 4
 # art-output: *.txt
 # art-output: *.log
 # art-output: log.*
@@ -24,7 +25,8 @@ ex = ExecStep.ExecStep()
 ex.type = 'athena'
 ex.job_options = 'TriggerJobOpts/runHLT_standalone.py'
 ex.input = 'ttbar'
-ex.threads = 1
+ex.threads = 4
+ex.concurrent_events = 4
 ex.args = '-c "setMenu=\'MC_pp_run3_v1\';doWriteBS=False;doWriteRDOTrigger=True;"'
 
 test = Test.Test()
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1PhysP1_grid.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1PhysP1_grid.py
index a950aa8984a180b93a700136d08bd3333f8db3e1..50c63fa1915875a8e3c0e9b5ffb48fe97adaa419 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1PhysP1_grid.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1PhysP1_grid.py
@@ -4,6 +4,7 @@
 # art-description: Trigger RDO->RDO_TRIG athena test of the PhysicsP1_pp_run3_v1 menu
 # art-type: grid
 # art-include: master/Athena
+# art-athena-mt: 4
 # art-output: *.txt
 # art-output: *.log
 # art-output: log.*
@@ -24,7 +25,8 @@ ex = ExecStep.ExecStep()
 ex.type = 'athena'
 ex.job_options = 'TriggerJobOpts/runHLT_standalone.py'
 ex.input = 'ttbar'
-ex.threads = 1
+ex.threads = 4
+ex.concurrent_events = 4
 ex.args = '-c "setMenu=\'PhysicsP1_pp_run3_v1\';doWriteBS=False;doWriteRDOTrigger=True;"'
 
 test = Test.Test()
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Phys_grid.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Phys_grid.py
index 732a19a4b137723cf5aad1ba54f0dc3e950a34b2..3be147f9fa51f4ee6ebfc6e5939f65e77b8640ba 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Phys_grid.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Phys_grid.py
@@ -4,6 +4,7 @@
 # art-description: Trigger RDO->RDO_TRIG athena test of the Physics_pp_run3_v1 menu
 # art-type: grid
 # art-include: master/Athena
+# art-athena-mt: 4
 # art-output: *.txt
 # art-output: *.log
 # art-output: log.*
@@ -24,7 +25,8 @@ ex = ExecStep.ExecStep()
 ex.type = 'athena'
 ex.job_options = 'TriggerJobOpts/runHLT_standalone.py'
 ex.input = 'ttbar'
-ex.threads = 1
+ex.threads = 4
+ex.concurrent_events = 4
 ex.args = '-c "setMenu=\'Physics_pp_run3_v1\';doWriteBS=False;doWriteRDOTrigger=True;"'
 
 test = Test.Test()